diff --git a/po/cs.po b/po/cs.po
index 6e8b1e7ee..2b28f8ece 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2017-09-11 04:50+0000\n"
 "Last-Translator: Zdenek <chmelarz@gmail.com>\n"
 "Language-Team: Czech\n"
@@ -15,45 +15,45 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -64,39 +64,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -105,11 +105,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -118,7 +118,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -127,7 +127,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -135,25 +135,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -169,35 +169,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -207,7 +207,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -219,11 +219,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -231,91 +231,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -327,7 +327,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -335,7 +335,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -345,7 +345,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -357,268 +357,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -627,417 +627,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1045,102 +1043,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1149,32 +1146,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1182,328 +1179,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1512,148 +1509,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1664,61 +1661,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1728,270 +1725,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2017,7 +2012,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2031,7 +2026,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2044,7 +2039,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2055,14 +2050,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2070,7 +2065,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2082,13 +2077,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2102,7 +2097,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2116,27 +2111,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2152,14 +2147,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2168,208 +2163,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2382,364 +2377,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2750,84 +2745,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2835,102 +2830,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2938,90 +2933,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3029,211 +3024,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7211,7 +7206,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7816,7 +7811,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr ""
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -7839,29 +7834,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7871,16 +7866,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7895,60 +7890,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 21f0d550a..adab300ee 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:48+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/libguestfs/"
@@ -23,45 +23,45 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -72,39 +72,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -113,11 +113,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -126,7 +126,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -135,7 +135,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -143,25 +143,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -177,35 +177,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -215,7 +215,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -227,11 +227,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -239,91 +239,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -335,7 +335,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -343,7 +343,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -353,7 +353,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -365,268 +365,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -635,417 +635,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1053,102 +1051,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1157,32 +1154,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1190,328 +1187,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1520,148 +1517,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1672,61 +1669,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1736,270 +1733,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2025,7 +2020,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2039,7 +2034,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2052,7 +2047,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2063,14 +2058,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2078,7 +2073,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2090,13 +2085,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2110,7 +2105,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2124,27 +2119,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2160,14 +2155,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2176,208 +2171,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2390,364 +2385,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2758,84 +2753,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2843,102 +2838,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2946,90 +2941,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3037,211 +3032,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7214,7 +7209,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7819,7 +7814,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "Sie müssen guestfs_add_drive vor guestfs_launch aufrufen"
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -7842,29 +7837,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7874,16 +7869,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7898,60 +7893,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -8746,7 +8741,6 @@ msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr ""
 "virt-win-reg: {p}: Registry-Datei konnte nicht hochgeladen werden: {err}\n"
 
-#, c-format
 #~ msgid "%s: unknown command\n"
 #~ msgstr "%s: Unbekannter Befehl\n"
 
@@ -8771,7 +8765,6 @@ msgstr ""
 #~ msgid "Error"
 #~ msgstr "Fehler"
 
-#, c-format
 #~ msgid "Conversion failed: %s"
 #~ msgstr "Umwandlung fehlgeschlagen: %s"
 
@@ -8784,6 +8777,5 @@ msgstr ""
 #~ msgid "Conversion was successful"
 #~ msgstr "Die Umwandlung war erfolgreich"
 
-#, c-format
 #~ msgid "cannot open libvirt connection"
 #~ msgstr "libvirt-Verbindung konnte nicht geöffnet werden"
diff --git a/po/en_GB.po b/po/en_GB.po
index ef7ee38f1..efc3ebc67 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:48+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -21,45 +21,45 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -70,39 +70,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -111,11 +111,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -124,7 +124,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -133,7 +133,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -141,25 +141,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -175,35 +175,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -213,7 +213,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -225,11 +225,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -237,91 +237,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -333,7 +333,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -341,7 +341,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -351,7 +351,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -363,268 +363,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -633,417 +633,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1051,102 +1049,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1155,32 +1152,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1188,328 +1185,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1518,148 +1515,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1670,61 +1667,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1734,270 +1731,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2023,7 +2018,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2037,7 +2032,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2050,7 +2045,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2061,14 +2056,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2076,7 +2071,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2088,13 +2083,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2108,7 +2103,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2122,27 +2117,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2158,14 +2153,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2174,208 +2169,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2388,364 +2383,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2756,84 +2751,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2841,102 +2836,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2944,90 +2939,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3035,211 +3030,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7203,7 +7198,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7808,7 +7803,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr ""
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -7831,29 +7826,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7863,16 +7858,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7887,60 +7882,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -8729,7 +8724,6 @@ msgstr ""
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr ""
 
-#, c-format
 #~ msgid ""
 #~ "%s: list filesystems, partitions, block devices, LVM in a VM\n"
 #~ "Copyright (C) 2010 Red Hat Inc.\n"
diff --git a/po/es.po b/po/es.po
index 494e20f45..d12748003 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-03-16 07:04+0000\n"
 "Last-Translator: Alex Puchades <alex94puchades@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -24,45 +24,45 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -73,39 +73,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -114,11 +114,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -127,7 +127,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -136,7 +136,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -144,25 +144,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -178,35 +178,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -216,7 +216,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -228,11 +228,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -240,91 +240,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -336,7 +336,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -344,7 +344,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -354,7 +354,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -366,268 +366,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -636,417 +636,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1054,102 +1052,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1158,32 +1155,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1191,328 +1188,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1521,148 +1518,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1673,61 +1670,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1737,270 +1734,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2026,7 +2021,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2040,7 +2035,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2053,7 +2048,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2064,14 +2059,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2079,7 +2074,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2091,13 +2086,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2111,7 +2106,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2125,27 +2120,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2161,14 +2156,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2177,208 +2172,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2391,364 +2386,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2759,84 +2754,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2844,102 +2839,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2947,90 +2942,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3038,211 +3033,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7279,7 +7274,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7884,7 +7879,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "antes de guestfs_launch, debe llamar guestfs_add_drive"
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "qemu ha sido iniciado y contactado el demonio, pero es estado es != READY"
@@ -7908,29 +7903,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7940,16 +7935,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7964,60 +7959,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -8846,7 +8841,6 @@ msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr ""
 "virt-win-reg: {p}: no ha sido posible cargar el archivo de registro: {err}\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: list filesystems, partitions, block devices, LVM in a VM\n"
 #~ "Copyright (C) 2010 Red Hat Inc.\n"
@@ -8922,6 +8916,5 @@ msgstr ""
 #~ "  -x                   Rastrea llamadas API de libguestfs\n"
 #~ "Para obtener mayor información, consulte la página man %s(1).\n"
 
-#, c-format
 #~ msgid "%s: unknown command\n"
 #~ msgstr "%s: comando desconocido\n"
diff --git a/po/eu.po b/po/eu.po
index 8374fd3f5..13b2ca0ed 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:49+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/libguestfs/"
@@ -21,45 +21,45 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -70,39 +70,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -111,11 +111,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -124,7 +124,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -133,7 +133,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -141,25 +141,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -175,35 +175,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -213,7 +213,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -225,11 +225,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -237,91 +237,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -333,7 +333,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -341,7 +341,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -351,7 +351,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -363,268 +363,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -633,417 +633,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1051,102 +1049,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1155,32 +1152,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1188,328 +1185,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1518,148 +1515,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1670,61 +1667,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1734,270 +1731,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2023,7 +2018,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2037,7 +2032,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2050,7 +2045,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2061,14 +2056,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2076,7 +2071,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2088,13 +2083,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2108,7 +2103,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2122,27 +2117,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2158,14 +2153,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2174,208 +2169,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2388,364 +2383,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2756,84 +2751,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2841,102 +2836,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2944,90 +2939,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3035,211 +3030,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7203,7 +7198,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7808,7 +7803,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr ""
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -7831,29 +7826,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7863,16 +7858,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7887,60 +7882,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 1590984c6..efba63201 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:49+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/libguestfs/"
@@ -24,45 +24,45 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -73,39 +73,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -114,11 +114,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -127,7 +127,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -136,7 +136,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -144,25 +144,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -178,35 +178,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -216,7 +216,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -228,11 +228,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -240,91 +240,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -336,7 +336,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -344,7 +344,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -354,7 +354,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -366,268 +366,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -636,417 +636,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1054,102 +1052,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1158,32 +1155,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1191,328 +1188,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1521,148 +1518,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1673,61 +1670,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1737,270 +1734,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2026,7 +2021,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2040,7 +2035,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2053,7 +2048,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2064,14 +2059,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2079,7 +2074,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2091,13 +2086,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2111,7 +2106,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2125,27 +2120,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2161,14 +2156,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2177,208 +2172,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2391,364 +2386,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2759,84 +2754,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2844,102 +2839,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2947,90 +2942,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3038,211 +3033,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7301,7 +7296,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7916,7 +7911,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "vous devez appeler guestfs_add_drive avant guestfs_launch"
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu est lancé et a contacté le démon, mais l'état est != PRÊT"
 
@@ -7939,30 +7934,30 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 "le drapeau de mode direct n'est pas pris en charge par le moteur libvirt"
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr "impossible de se connecter à libvirt (URI = %s)"
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr "impossible d'obtenir les capacités libvirt"
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7972,16 +7967,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr "impossible d'analyser les capacités XML renvoyées par libvirt"
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr "impossible d'évaluer l'expression XPath : %s"
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7996,60 +7991,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr "impossible d'arrêter le domaine libvirt"
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr "%s : erreur interne lors de la construction du message d'erreur"
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr "impossible d'attacher le disque au domaine libvirt"
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr "impossible de détacher le disque du domaine libvirt"
 
@@ -8900,7 +8895,6 @@ msgstr ""
 "virt-win-reg : {p} : impossible de téléverser le fichier de registre  : "
 "{err}\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: list filesystems, partitions, block devices, LVM in a VM\n"
 #~ "Copyright (C) 2010 Red Hat Inc.\n"
@@ -8979,6 +8973,5 @@ msgstr ""
 #~ "  -x                   Tracer les appels de l'API libguestfs\n"
 #~ "Pour plus d'informations, voir la page de manuel %s(1).\n"
 
-#, c-format
 #~ msgid "%s: unknown command\n"
 #~ msgstr "%s : commande inconnue\n"
diff --git a/po/gu.po b/po/gu.po
index 191492bdb..c0ab6be70 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:49+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Gujarati (http://www.transifex.com/projects/p/libguestfs/"
@@ -22,45 +22,45 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -71,39 +71,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -112,11 +112,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -125,7 +125,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -134,7 +134,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -142,25 +142,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -176,35 +176,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -214,7 +214,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -226,11 +226,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -238,91 +238,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -334,7 +334,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -342,7 +342,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -352,7 +352,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -364,268 +364,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -634,417 +634,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1052,102 +1050,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1156,32 +1153,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1189,328 +1186,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1519,148 +1516,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1671,61 +1668,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1735,270 +1732,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2024,7 +2019,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2038,7 +2033,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2051,7 +2046,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2062,14 +2057,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2077,7 +2072,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2089,13 +2084,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2109,7 +2104,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2123,27 +2118,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2159,14 +2154,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2175,208 +2170,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2389,364 +2384,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2757,84 +2752,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2842,102 +2837,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2945,90 +2940,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3036,211 +3031,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7209,7 +7204,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7814,7 +7809,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "તમારે guestfs_launch પહેલાં guestfs_add_drive ને કોલ કરવુ જ જોઇએ"
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu શરૂ થયેલ છે, ડિમનનો સંપર્ક થયેલ છે, પરંતુ state != READY"
 
@@ -7837,29 +7832,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7869,16 +7864,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7893,60 +7888,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -8735,6 +8730,5 @@ msgstr ""
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr ""
 
-#, c-format
 #~ msgid "%s: unknown command\n"
 #~ msgstr "%s: અજ્ઞાત આદેશ\n"
diff --git a/po/hi.po b/po/hi.po
index 0f3a04898..a8d6aa397 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:49+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/libguestfs/"
@@ -22,45 +22,45 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -71,39 +71,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -112,11 +112,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -125,7 +125,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -134,7 +134,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -142,25 +142,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -176,35 +176,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -214,7 +214,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -226,11 +226,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -238,91 +238,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -334,7 +334,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -342,7 +342,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -352,7 +352,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -364,268 +364,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -634,417 +634,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1052,102 +1050,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1156,32 +1153,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1189,328 +1186,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1519,148 +1516,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1671,61 +1668,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1735,270 +1732,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2024,7 +2019,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2038,7 +2033,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2051,7 +2046,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2062,14 +2057,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2077,7 +2072,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2089,13 +2084,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2109,7 +2104,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2123,27 +2118,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2159,14 +2154,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2175,208 +2170,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2389,364 +2384,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2757,84 +2752,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2842,102 +2837,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2945,90 +2940,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3036,211 +3031,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7206,7 +7201,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7811,7 +7806,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "you must call guestfs_add_drive before guestfs_launch"
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu launched and contacted daemon, but state != READY"
 
@@ -7834,29 +7829,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7866,16 +7861,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7890,60 +7885,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -8732,6 +8727,5 @@ msgstr ""
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr ""
 
-#, c-format
 #~ msgid "%s: unknown command\n"
 #~ msgstr "%s: अज्ञात कमांड\n"
diff --git a/po/ja.po b/po/ja.po
index a7b2fbd0b..625cce02a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2017-02-24 07:33+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -23,45 +23,45 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -72,39 +72,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -113,11 +113,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -126,7 +126,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -135,7 +135,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -143,25 +143,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -177,35 +177,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -215,7 +215,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -227,11 +227,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -239,91 +239,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -335,7 +335,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -343,7 +343,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -353,7 +353,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -365,268 +365,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -635,417 +635,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1053,102 +1051,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1157,32 +1154,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1190,328 +1187,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1520,148 +1517,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1672,61 +1669,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1736,270 +1733,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2025,7 +2020,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2039,7 +2034,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2052,7 +2047,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2063,14 +2058,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2078,7 +2073,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2090,13 +2085,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2110,7 +2105,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2124,27 +2119,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2160,14 +2155,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2176,208 +2171,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2390,364 +2385,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2758,84 +2753,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2843,102 +2838,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2946,90 +2941,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3037,211 +3032,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7285,7 +7280,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7902,7 +7897,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "guestfs_launch の前に guestfs_add_drive を呼び出す必要があります"
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "QEMU が起動され、デーモンに接続されましたが、state != READY です"
 
@@ -7925,31 +7920,31 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 "ダイレクトモードフラグは libvirt バックエンドに対してまだサポートされていませ"
 "ん"
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr "libvirt (URI = %s) に接続できませんでした"
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr "libvirt ケイパビリティを取得できませんでした"
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7959,16 +7954,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr "libvirt により返されたケイパビリティ XML を構文解析できません"
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr "XPath 表現を評価できません: %s"
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7983,20 +7978,20 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
@@ -8004,41 +7999,41 @@ msgstr ""
 "libvirt が qemu curl ドライバープロトコル (ftp, http など) をサポートしませ"
 "ん; LIBGUESTFS_BACKEND=direct の設定を試してください"
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr "libvirt 仮想マシンを強制停止できませんでした"
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr "%s: エラーメッセージを形成している内部エラー"
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr "libvirt 仮想マシンにディスクを接続できませんでした"
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr "libvirt 仮想マシンからディスクを切断できませんでした"
 
@@ -8886,7 +8881,6 @@ msgstr ""
 "virt-win-reg: {p}: レジストリ・ファイルをアップロードできませんでした: "
 "{err}\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: list filesystems, partitions, block devices, LVM in a VM\n"
 #~ "Copyright (C) 2010 Red Hat Inc.\n"
@@ -8962,6 +8956,5 @@ msgstr ""
 #~ "  -x                   libguestfs APIの呼び出しをトレースします。\n"
 #~ "より詳しい情報は manpage %s(1) をご覧ください。\n"
 
-#, c-format
 #~ msgid "%s: unknown command\n"
 #~ msgstr "%s: 未知のコマンド\n"
diff --git a/po/kn.po b/po/kn.po
index 3078e06a4..f34d2449e 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/libguestfs/"
@@ -21,45 +21,45 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -70,39 +70,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -111,11 +111,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -124,7 +124,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -133,7 +133,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -141,25 +141,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -175,35 +175,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -213,7 +213,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -225,11 +225,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -237,91 +237,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -333,7 +333,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -341,7 +341,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -351,7 +351,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -363,268 +363,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -633,417 +633,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1051,102 +1049,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1155,32 +1152,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1188,328 +1185,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1518,148 +1515,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1670,61 +1667,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1734,270 +1731,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2023,7 +2018,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2037,7 +2032,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2050,7 +2045,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2061,14 +2056,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2076,7 +2071,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2088,13 +2083,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2108,7 +2103,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2122,27 +2117,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2158,14 +2153,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2174,208 +2169,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2388,364 +2383,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2756,84 +2751,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2841,102 +2836,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2944,90 +2939,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3035,211 +3030,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7212,7 +7207,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7817,7 +7812,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "ನೀವು guestfs_launch ನ ಮೊದಲು guestfs_add_drive ಅನ್ನು ಕರೆಯಬೇಕು"
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu ಆರಂಭಗೊಂಡಿದೆ ಹಾಗು ಡೀಮನ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಿದೆ, ಆದರೆ != READY ಸ್ಥಿತಿಯಲ್ಲಿದೆ"
 
@@ -7840,29 +7835,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7872,16 +7867,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7896,60 +7891,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/ml.po b/po/ml.po
index 3fb11b3e1..5db63e59a 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Malayalam (http://www.transifex.com/projects/p/libguestfs/"
@@ -21,45 +21,45 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -70,39 +70,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -111,11 +111,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -124,7 +124,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -133,7 +133,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -141,25 +141,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -175,35 +175,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -213,7 +213,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -225,11 +225,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -237,91 +237,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -333,7 +333,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -341,7 +341,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -351,7 +351,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -363,268 +363,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -633,417 +633,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1051,102 +1049,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1155,32 +1152,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1188,328 +1185,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1518,148 +1515,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1670,61 +1667,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1734,270 +1731,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2023,7 +2018,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2037,7 +2032,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2050,7 +2045,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2061,14 +2056,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2076,7 +2071,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2088,13 +2083,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2108,7 +2103,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2122,27 +2117,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2158,14 +2153,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2174,208 +2169,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2388,364 +2383,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2756,84 +2751,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2841,102 +2836,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2944,90 +2939,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3035,211 +3030,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7209,7 +7204,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7814,7 +7809,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "guestfs_launch-നു് മുമ്പു് guestfs_add_drive വിളിക്കേണ്ടതു്"
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu വിന്യസിച്ചു് ഡെമണുമായി ബന്ധപ്പെട്ടു, പക്ഷേ state != READY"
 
@@ -7837,29 +7832,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7869,16 +7864,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7893,60 +7888,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -8735,6 +8730,5 @@ msgstr ""
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr ""
 
-#, c-format
 #~ msgid "%s: unknown command\n"
 #~ msgstr "%s: അപരിചിതമായ കമാന്‍ഡ്\n"
diff --git a/po/mr.po b/po/mr.po
index ed21de6b7..0e01fb14f 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:51+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Marathi (http://www.transifex.com/projects/p/libguestfs/"
@@ -22,45 +22,45 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -71,39 +71,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -112,11 +112,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -125,7 +125,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -134,7 +134,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -142,25 +142,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -176,35 +176,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -214,7 +214,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -226,11 +226,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -238,91 +238,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -334,7 +334,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -342,7 +342,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -352,7 +352,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -364,268 +364,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -634,417 +634,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1052,102 +1050,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1156,32 +1153,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1189,328 +1186,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1519,148 +1516,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1671,61 +1668,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1735,270 +1732,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2024,7 +2019,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2038,7 +2033,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2051,7 +2046,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2062,14 +2057,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2077,7 +2072,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2089,13 +2084,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2109,7 +2104,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2123,27 +2118,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2159,14 +2154,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2175,208 +2170,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2389,364 +2384,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2757,84 +2752,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2842,102 +2837,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2945,90 +2940,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3036,211 +3031,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7222,7 +7217,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7827,7 +7822,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "guestfs_add_drive यांस guestfs_launch च्या अगोदर कॉल करा"
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu सुरू झाले व डिमन सुरू केले, परंतु state != READY आढळले"
 
@@ -7850,29 +7845,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7882,16 +7877,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7906,60 +7901,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -8763,7 +8758,6 @@ msgstr "virt-win-reg: {p}: रेजिस्ट्री फाइल डाउ
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr "virt-win-reg: {p}: रेजिस्ट्री फाइल अपलोड करणे शक्य नाही: {err}\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: list filesystems, partitions, block devices, LVM in a VM\n"
 #~ "Copyright (C) 2010 Red Hat Inc.\n"
@@ -8835,6 +8829,5 @@ msgstr "virt-win-reg: {p}: रेजिस्ट्री फाइल अपल
 #~ "  -x                   libguestfs API कॉल्स् ट्रेस करा\n"
 #~ "अधिक माहितीकरीता, manpage %s(1) पहा.\n"
 
-#, c-format
 #~ msgid "%s: unknown command\n"
 #~ msgstr "%s: अपरिचीत आदेश\n"
diff --git a/po/nl.po b/po/nl.po
index edac4d645..5eefcf874 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:51+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -23,45 +23,45 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -72,39 +72,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -113,11 +113,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -126,7 +126,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -135,7 +135,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -143,25 +143,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -177,35 +177,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -215,7 +215,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -227,11 +227,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -239,91 +239,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -335,7 +335,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -343,7 +343,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -353,7 +353,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -365,268 +365,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -635,417 +635,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1053,102 +1051,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1157,32 +1154,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1190,328 +1187,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1520,148 +1517,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1672,61 +1669,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1736,270 +1733,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2025,7 +2020,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2039,7 +2034,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2052,7 +2047,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2063,14 +2058,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2078,7 +2073,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2090,13 +2085,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2110,7 +2105,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2124,27 +2119,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2160,14 +2155,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2176,208 +2171,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2390,364 +2385,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2758,84 +2753,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2843,102 +2838,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2946,90 +2941,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3037,211 +3032,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7253,7 +7248,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7860,7 +7855,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "je moet guestfs_add_drive aanroepen voor guestfs_launch"
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "qemu gelanceerd en contact opgenomen met daemon, maar toestand != READY"
@@ -7884,29 +7879,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr "kon niet verbinden met libvirt (URI = %s)"
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr "kon libvirt mogelijkheden niet verkrijgen"
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7916,16 +7911,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7940,60 +7935,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr "kon libvirt domein niet vernietigen"
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr "%s: interne fout bij formuleren van foutboodschap"
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr "kon schijf niet koppelen aan libvirt domein"
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr "kon schijf niet loskoppelen van libvirt domein"
 
@@ -8820,7 +8815,6 @@ msgstr "virt-win-reg: {p}: kon registry bestand niet downloaden: {err}\n"
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr "virt-win-reg: {p}: kon registry bestand niet uploaden: {err}\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: list filesystems, partitions, block devices, LVM in a VM\n"
 #~ "Copyright (C) 2010 Red Hat Inc.\n"
@@ -8892,6 +8886,5 @@ msgstr "virt-win-reg: {p}: kon registry bestand niet uploaden: {err}\n"
 #~ "  -x                   Traceer libguestfs API aanroepen\n"
 #~ "Voor meer informatie, zie de man pagina %s(1).\n"
 
-#, c-format
 #~ msgid "%s: unknown command\n"
 #~ msgstr "%s: onbekend commando\n"
diff --git a/po/or.po b/po/or.po
index 0d94d6856..3e4cc8e36 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:51+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Oriya (http://www.transifex.com/projects/p/libguestfs/"
@@ -21,45 +21,45 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -70,39 +70,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -111,11 +111,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -124,7 +124,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -133,7 +133,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -141,25 +141,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -175,35 +175,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -213,7 +213,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -225,11 +225,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -237,91 +237,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -333,7 +333,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -341,7 +341,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -351,7 +351,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -363,268 +363,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -633,417 +633,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1051,102 +1049,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1155,32 +1152,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1188,328 +1185,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1518,148 +1515,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1670,61 +1667,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1734,270 +1731,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2023,7 +2018,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2037,7 +2032,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2050,7 +2045,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2061,14 +2056,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2076,7 +2071,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2088,13 +2083,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2108,7 +2103,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2122,27 +2117,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2158,14 +2153,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2174,208 +2169,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2388,364 +2383,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2756,84 +2751,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2841,102 +2836,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2944,90 +2939,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3035,211 +3030,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7206,7 +7201,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7811,7 +7806,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "ଆପଣ ନିଶ୍ଚିତ ଭାବରେ guestfs_add_drive କୁ guestfs_launch ପୂର୍ବରୁ ଡାକିବା ଉଚିତ"
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu ଆରମ୍ଭ ହୋଇଛି ଏବଂ ଡେମନ ସହିତ ଯୋଗାଯୋଗ ଆରମ୍ଭ କରିଛି, କିନ୍ତୁ ଅବସ୍ଥା != READY"
 
@@ -7834,29 +7829,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7866,16 +7861,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7890,60 +7885,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -8732,6 +8727,5 @@ msgstr ""
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr ""
 
-#, c-format
 #~ msgid "%s: unknown command\n"
 #~ msgstr "%s: ଅଜଣା ନିର୍ଦ୍ଦେଶ\n"
diff --git a/po/pa.po b/po/pa.po
index 65e017559..30c37ce64 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:52+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/"
@@ -22,45 +22,45 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -71,39 +71,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -112,11 +112,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -125,7 +125,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -134,7 +134,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -142,25 +142,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -176,35 +176,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -214,7 +214,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -226,11 +226,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -238,91 +238,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -334,7 +334,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -342,7 +342,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -352,7 +352,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -364,268 +364,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -634,417 +634,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1052,102 +1050,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1156,32 +1153,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1189,328 +1186,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1519,148 +1516,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1671,61 +1668,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1735,270 +1732,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2024,7 +2019,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2038,7 +2033,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2051,7 +2046,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2062,14 +2057,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2077,7 +2072,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2089,13 +2084,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2109,7 +2104,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2123,27 +2118,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2159,14 +2154,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2175,208 +2170,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2389,364 +2384,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2757,84 +2752,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2842,102 +2837,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2945,90 +2940,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3036,211 +3031,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7219,7 +7214,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7824,7 +7819,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "you must call guestfs_add_drive before guestfs_launch"
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu launched and contacted daemon, but state != READY"
 
@@ -7847,29 +7842,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7879,16 +7874,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7903,60 +7898,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -8761,7 +8756,6 @@ msgstr "virt-win-reg: {p}: ਰਜਿਸਟਰੀ ਫਾਇਲ ਡਾਊਨਲੋ
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr "virt-win-reg: {p}: ਰਜਿਸਟਰੀ ਫਾਇਲ ਨੂੰ ਅੱਪਲੋਡ ਨਹੀਂ ਕਰ ਸਕਦਾ: {err}\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: list filesystems, partitions, block devices, LVM in a VM\n"
 #~ "Copyright (C) 2010 Red Hat Inc.\n"
@@ -8833,6 +8827,5 @@ msgstr "virt-win-reg: {p}: ਰਜਿਸਟਰੀ ਫਾਇਲ ਨੂੰ ਅੱ
 #~ "  -x                   Trace libguestfs API calls\n"
 #~ "For more information, see the manpage %s(1)।\n"
 
-#, c-format
 #~ msgid "%s: unknown command\n"
 #~ msgstr "%s: ਅਣਜਾਣ ਕਮਾਂਡ\n"
diff --git a/po/pl.po b/po/pl.po
index 3fba0c47a..c6aebecfc 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2016-09-14 05:28+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/libguestfs/"
@@ -26,45 +26,45 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -75,39 +75,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -116,11 +116,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -129,7 +129,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -138,7 +138,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -146,25 +146,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -180,35 +180,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -218,7 +218,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -230,11 +230,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -242,91 +242,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -338,7 +338,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -346,7 +346,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -356,7 +356,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -368,268 +368,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -638,417 +638,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1056,102 +1054,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1160,32 +1157,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1193,328 +1190,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1523,148 +1520,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1675,61 +1672,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1739,270 +1736,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2028,7 +2023,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2042,7 +2037,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2055,7 +2050,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2066,14 +2061,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2081,7 +2076,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2093,13 +2088,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2113,7 +2108,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2127,27 +2122,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2163,14 +2158,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2179,208 +2174,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2393,364 +2388,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2761,84 +2756,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2846,102 +2841,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2949,90 +2944,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3040,211 +3035,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7267,7 +7262,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7878,7 +7873,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "należy wywołać guestfs_add_drive przed guestfs_launch"
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "QEMU zostało uruchomione i skontaktowano się z usługą, ale stan != GOTOWY"
@@ -7902,29 +7897,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7934,16 +7929,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7958,60 +7953,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr "nie można dołączyć dysku do domeny biblioteki libvirt"
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr "nie można odłączyć dysku od domeny biblioteki libvirt"
 
@@ -8842,7 +8837,6 @@ msgstr "virt-win-reg: {p}: nie można pobrać pliku rejestru: {err}\n"
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr "virt-win-reg: {p}: nie można wysłać pliku rejestru: {err}\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: list filesystems, partitions, block devices, LVM in a VM\n"
 #~ "Copyright (C) 2010 Red Hat Inc.\n"
@@ -8917,18 +8911,14 @@ msgstr "virt-win-reg: {p}: nie można wysłać pliku rejestru: {err}\n"
 #~ "  -x                   Śledzi wywołania API biblioteki libguestfs\n"
 #~ "Strona podręcznika %s(1) zawiera więcej informacji.\n"
 
-#, c-format
 #~ msgid "error: incorrect number of arguments\n"
 #~ msgstr "błąd: niepoprawna liczba parametrów\n"
 
-#, c-format
 #~ msgid "usage: %s\n"
 #~ msgstr "użycie: %s\n"
 
-#, c-format
 #~ msgid "type 'help %s' for more help on %s\n"
 #~ msgstr "wpisanie „help %s” wyświetli pomoc dla %s\n"
 
-#, c-format
 #~ msgid "%s: unknown command\n"
 #~ msgstr "%s: nieznane polecenie\n"
diff --git a/po/ru.po b/po/ru.po
index 5f4aaa61c..9680a21e4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:52+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/libguestfs/"
@@ -22,45 +22,45 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -71,39 +71,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -112,11 +112,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -125,7 +125,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -134,7 +134,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -142,25 +142,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -176,35 +176,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -214,7 +214,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -226,11 +226,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -238,91 +238,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -334,7 +334,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -342,7 +342,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -352,7 +352,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -364,268 +364,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -634,417 +634,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1052,102 +1050,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1156,32 +1153,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1189,328 +1186,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1519,148 +1516,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1671,61 +1668,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1735,270 +1732,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2024,7 +2019,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2038,7 +2033,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2051,7 +2046,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2062,14 +2057,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2077,7 +2072,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2089,13 +2084,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2109,7 +2104,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2123,27 +2118,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2159,14 +2154,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2175,208 +2170,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2389,364 +2384,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2757,84 +2752,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2842,102 +2837,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2945,90 +2940,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3036,211 +3031,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7204,7 +7199,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7809,7 +7804,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr ""
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -7832,29 +7827,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7864,16 +7859,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7888,60 +7883,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/ta.po b/po/ta.po
index 7d49ee702..db13b7567 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:53+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Tamil (http://www.transifex.com/projects/p/libguestfs/"
@@ -21,45 +21,45 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -70,39 +70,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -111,11 +111,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -124,7 +124,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -133,7 +133,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -141,25 +141,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -175,35 +175,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -213,7 +213,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -225,11 +225,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -237,91 +237,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -333,7 +333,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -341,7 +341,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -351,7 +351,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -363,268 +363,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -633,417 +633,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1051,102 +1049,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1155,32 +1152,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1188,328 +1185,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1518,148 +1515,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1670,61 +1667,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1734,270 +1731,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2023,7 +2018,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2037,7 +2032,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2050,7 +2045,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2061,14 +2056,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2076,7 +2071,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2088,13 +2083,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2108,7 +2103,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2122,27 +2117,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2158,14 +2153,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2174,208 +2169,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2388,364 +2383,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2756,84 +2751,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2841,102 +2836,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2944,90 +2939,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3035,211 +3030,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7207,7 +7202,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7812,7 +7807,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "நீங்கள் guestfs_add_drive ஐ guestfs_launchக்கு முன் அழைக்க வேண்டும்"
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu டொமைனுடன் துவக்கப்பட்டு தொடர்பு கொண்டது, ஆனால் நிலையானது != READY"
 
@@ -7835,29 +7830,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7867,16 +7862,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7891,60 +7886,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -8733,6 +8728,5 @@ msgstr ""
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr ""
 
-#, c-format
 #~ msgid "%s: unknown command\n"
 #~ msgstr "%s: தெரியாத கட்டளை\n"
diff --git a/po/te.po b/po/te.po
index 18bb559be..caf3e06ae 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:53+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/libguestfs/"
@@ -21,45 +21,45 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -70,39 +70,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -111,11 +111,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -124,7 +124,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -133,7 +133,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -141,25 +141,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -175,35 +175,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -213,7 +213,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -225,11 +225,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -237,91 +237,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -333,7 +333,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -341,7 +341,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -351,7 +351,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -363,268 +363,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -633,417 +633,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1051,102 +1049,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1155,32 +1152,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1188,328 +1185,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1518,148 +1515,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1670,61 +1667,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1734,270 +1731,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2023,7 +2018,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2037,7 +2032,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2050,7 +2045,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2061,14 +2056,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2076,7 +2071,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2088,13 +2083,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2108,7 +2103,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2122,27 +2117,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2158,14 +2153,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2174,208 +2169,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2388,364 +2383,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2756,84 +2751,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2841,102 +2836,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2944,90 +2939,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3035,211 +3030,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7205,7 +7200,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7810,7 +7805,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "guestfs_launchకు ముందుగా మీరు guestfs_add_driveను పిలువవలెను"
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu ఆరంభించబడింది మరియు డెమోన్‌ను సంప్రదించింది, అయితే state != READY"
 
@@ -7833,29 +7828,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7865,16 +7860,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7889,60 +7884,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
@@ -8731,6 +8726,5 @@ msgstr ""
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr ""
 
-#, c-format
 #~ msgid "%s: unknown command\n"
 #~ msgstr "%s: తెలియని ఆదేశము\n"
diff --git a/po/tg.po b/po/tg.po
index 0ad81b4d4..07721f703 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:53+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Tajik (http://www.transifex.com/projects/p/libguestfs/"
@@ -20,45 +20,45 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -69,39 +69,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -110,11 +110,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -123,7 +123,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -132,7 +132,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -140,25 +140,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -174,35 +174,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -212,7 +212,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -224,11 +224,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -236,91 +236,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -332,7 +332,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -340,7 +340,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -350,7 +350,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -362,268 +362,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -632,417 +632,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1050,102 +1048,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1154,32 +1151,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1187,328 +1184,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1517,148 +1514,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1669,61 +1666,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1733,270 +1730,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2022,7 +2017,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2036,7 +2031,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2049,7 +2044,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2060,14 +2055,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2075,7 +2070,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2087,13 +2082,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2107,7 +2102,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2121,27 +2116,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2157,14 +2152,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2173,208 +2168,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2387,364 +2382,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2755,84 +2750,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2840,102 +2835,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2943,90 +2938,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3034,211 +3029,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7202,7 +7197,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7807,7 +7802,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr ""
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -7830,29 +7825,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7862,16 +7857,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7886,60 +7881,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 5dbc313b3..7f406a625 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2019-01-10 06:24+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -28,45 +28,45 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -77,39 +77,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -118,11 +118,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -131,7 +131,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -140,7 +140,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -148,25 +148,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -182,35 +182,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -220,7 +220,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -232,11 +232,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -244,91 +244,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -340,7 +340,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -348,7 +348,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -358,7 +358,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -370,268 +370,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -640,417 +640,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1058,102 +1056,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1162,32 +1159,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1195,328 +1192,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1525,148 +1522,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1677,61 +1674,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1741,270 +1738,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2030,7 +2025,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2044,7 +2039,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2057,7 +2052,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2068,14 +2063,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2083,7 +2078,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2095,13 +2090,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2115,7 +2110,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2129,27 +2124,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2165,14 +2160,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2181,208 +2176,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2395,364 +2390,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2763,84 +2758,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2848,102 +2843,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2951,90 +2946,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3042,211 +3037,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7480,7 +7475,7 @@ msgstr "xmlNewTextWriter: не вдалося створити процес за
 msgid "unable to parse XML from stdin"
 msgstr "не вдалося обробити код XML з stdin"
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -8154,7 +8149,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "вам слід викликати guestfs_add_drive перед викликом guestfs_launch"
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "qemu запущено, встановлено зв’язок з фоновою службою, але стан процесу не "
@@ -8190,31 +8185,31 @@ msgstr ""
 "параметра «--format» або за допомогою додаткового параметра аргументу "
 "формату до «add-drive»."
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 "у модулі libvirt ще не передбачено підтримки прапорця безпосереднього режиму"
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 "щоб скористатися модулем «libvirt», вам слід встановити libvirt >= %d.%d.%d"
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr "не вдалося встановити з’єднання з libvirt (URI = %s)"
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr "не вдалося визначити можливості libvirt"
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -8231,17 +8226,17 @@ msgstr ""
 "\n"
 "Початкове повідомлення від libvirt"
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 "не вдалося обробити запис можливостей у форматі XML, повернутий libvirt"
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr "не вдалося обробити вираз XPath: %s"
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -8269,20 +8264,20 @@ msgstr ""
 "guestfs(3) та списком поширених питань щодо libguestfs та відповідей\n"
 "на ці питання."
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr "підтримки параметра «iface» у модулі libvirt не передбачено"
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr "realpath: не вдалося перетворити «%s» на абсолютний шлях"
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
@@ -8290,42 +8285,42 @@ msgstr ""
 "у libvirt не передбачено підтримки драйверів протоколів curl qemu (ftp, http "
 "тощо); спробуйте встановити LIBGUESTFS_BACKEND=direct"
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr "не вдалося визначити реєстраційні дані libvirt"
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 "реєстраційні дані протоколу rbd має бути закодовано за допомогою base64"
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr "base64_decode_alloc: %m"
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr "не вдалося встановити значення реєстраційних даних libvirt"
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr "не вдалося отримати UUID із реєстраційних даних libvirt"
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr "не вдалося знищити домен libvirt"
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr "%s: внутрішня помилка формування повідомлення щодо помилки"
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr "не вдалося долучити диск до домену libvirt"
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr "не вдалося від’єднати диск від домену libvirt"
 
@@ -9221,7 +9216,6 @@ msgstr "virt-win-reg: {p}: не вдалося отримати файл рег
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr "virt-win-reg: {p}: не вдалося вивантажити файл регістра: {err}\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: check alignment of virtual machine partitions\n"
 #~ "Copyright (C) 2011 Red Hat Inc.\n"
@@ -9263,7 +9257,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "З докладнішими даними можна ознайомитися на сторінці довідника (man) "
 #~ "%s(1).\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: display files in a virtual machine\n"
 #~ "Copyright (C) 2010 Red Hat Inc.\n"
@@ -9309,7 +9302,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "libguestfs\n"
 #~ "Щоб дізнатися більше, скористайтеся сторінкою довідника (man) %s(1).\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: list filesystems, partitions, block devices, LVM in a VM\n"
 #~ "Copyright (C) 2010 Red Hat Inc.\n"
@@ -9387,7 +9379,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "libguestfs\n"
 #~ "Щоб дізнатися більше, ознайомтеся зі сторінкою довідника (man) %s(1).\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: display log files in a virtual machine\n"
 #~ "Copyright (C) 2010-2019 Red Hat Inc.\n"
@@ -9431,7 +9422,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "libguestfs\n"
 #~ "Щоб дізнатися більше, скористайтеся сторінкою довідника (man) %s(1).\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: list files in a virtual machine\n"
 #~ "Copyright (C) 2010-2012 Red Hat Inc.\n"
@@ -9499,7 +9489,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "  -x                   Трасувати виклики API libguestfs\n"
 #~ "Щоб дізнатися більше, скористайтеся сторінкою довідника (man) %s(1).\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: follow (tail) files in a virtual machine\n"
 #~ "Copyright (C) 2016 Red Hat Inc.\n"
@@ -9547,7 +9536,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "libguestfs\n"
 #~ "Щоб дізнатися більше, скористайтеся сторінкою довідника (man) %s(1).\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: display free space on virtual filesystems\n"
 #~ "Copyright (C) 2010 Red Hat Inc.\n"
@@ -9596,7 +9584,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "libguestfs\n"
 #~ "Щоб дізнатися більше, ознайомтеся зі сторінкою довідника (man) %s(1).\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: list differences between virtual machines\n"
 #~ "Copyright (C) 2010-2019 Red Hat Inc.\n"
@@ -9670,7 +9657,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "  --xattrs             Вивести розширені записи атрибутів\n"
 #~ "Щоб дізнатися більше, скористайтеся сторінкою довідника (man) %s(1).\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: Edit a file in a virtual machine\n"
 #~ "Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -9722,23 +9708,18 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "  -x                    Трасувати виклики API libguestfs\n"
 #~ "Щоб дізнатися більше, скористайтеся сторінкою довідника (man) %s(1).\n"
 
-#, c-format
 #~ msgid "error: incorrect number of arguments\n"
 #~ msgstr "помилка: помилкова кількість аргументів\n"
 
-#, c-format
 #~ msgid "usage: %s\n"
 #~ msgstr "користування: %s\n"
 
-#, c-format
 #~ msgid "type 'help %s' for more help on %s\n"
 #~ msgstr "введіть «help %s», щоб отримати додаткові довідкові дані щодо %s\n"
 
-#, c-format
 #~ msgid "%s: unknown command\n"
 #~ msgstr "%s: невідома команда\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: guest filesystem shell\n"
 #~ "%s lets you edit virtual machine filesystems\n"
@@ -9850,7 +9831,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "\n"
 #~ "Щоб дізнатися більше, ознайомтеся зі сторінкою довідника (man) %s(1).\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: erase and make a blank disk\n"
 #~ "Copyright (C) 2012 Red Hat Inc.\n"
@@ -9900,7 +9880,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "%s\n"
 #~ "\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: FUSE module for libguestfs\n"
 #~ "%s lets you mount a virtual machine filesystem\n"
@@ -9968,7 +9947,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "  -w|--rw              змонтувати для читання і запису\n"
 #~ "  -x|--trace           трасувати виклики програмного інтерфейсу guestfs\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: display information about a virtual machine\n"
 #~ "Copyright (C) 2010 Red Hat Inc.\n"
@@ -10015,7 +9993,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "  --xpath query        Виконати запит XPath\n"
 #~ "Щоб дізнатися більше, скористайтеся сторінкою довідника (man) %s(1).\n"
 
-#, c-format
 #~ msgid ""
 #~ "bridge ‘%s’ not found.  Try running:\n"
 #~ "\n"
@@ -10042,7 +10019,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "Ймовірно, вам також слід дозволити місток у /etc/qemu/bridge.conf.\n"
 #~ "Докладніший опис можна знайти на сторінці підручника guestfs(3)."
 
-#, c-format
 #~ msgid ""
 #~ "%s: make a filesystem from a tar archive or files\n"
 #~ "Copyright (C) 2010-2019 Red Hat Inc.\n"
@@ -10082,11 +10058,9 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "  -x                     Трасувати виклики інтерфейсу libguestfs\n"
 #~ "Щоб дізнатися більше, ознайомтеся зі сторінкою довідника (man) %s(1).\n"
 
-#, c-format
 #~ msgid "Starting local NBD server for %s ..."
 #~ msgstr "Запускаємо локальний сервер NBD для %s…"
 
-#, c-format
 #~ msgid "Opening data connection for %s ..."
 #~ msgstr "Відкриваємо з’єднання для обміну даними для %s…"
 
@@ -10257,7 +10231,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ msgid "Start _conversion"
 #~ msgstr "Почати п_еретворення"
 
-#, c-format
 #~ msgid ""
 #~ "virt-p2v (client):\n"
 #~ "%s"
@@ -10265,7 +10238,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "virt-p2v (клієнт):\n"
 #~ "%s"
 
-#, c-format
 #~ msgid ""
 #~ "virt-p2v (client):\n"
 #~ "%s\n"
@@ -10289,14 +10261,12 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ msgid "Connect to virtual network"
 #~ msgstr "Встановити з’єднання із віртуальною мережею"
 
-#, c-format
 #~ msgid ""
 #~ "Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
 #~ msgstr ""
 #~ "Кількість віртуальних процесорів перевищує максимальну підтримувану KVM "
 #~ "(максимум: %d)."
 
-#, c-format
 #~ msgid ""
 #~ "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
 #~ msgstr ""
@@ -10323,7 +10293,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ msgid "_Shutdown ..."
 #~ msgstr "Ви_мкнути…"
 
-#, c-format
 #~ msgid ""
 #~ "Debug information and log files are saved to this directory on the "
 #~ "conversion server:\n"
@@ -10346,7 +10315,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "Не вказано дисків для перетворення.\n"
 #~ "Слід вказати принаймні один стаціонарний жорсткий диск.\n"
 
-#, c-format
 #~ msgid "Conversion failed: %s"
 #~ msgstr "Помилка під час перетворення: %s"
 
@@ -10369,7 +10337,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ msgid "Cancel the conversion"
 #~ msgstr "Скасувати перетворення"
 
-#, c-format
 #~ msgid ""
 #~ "%s: Convert a physical machine to use KVM\n"
 #~ "Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -10402,19 +10369,15 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "  -V|--version           вивести дані щодо версії і вийти\n"
 #~ "Щоб дізнатися більше, ознайомтеся зі сторінкою man %s(1).\n"
 
-#, c-format
 #~ msgid "only a single --test-disk option can be used"
 #~ msgstr "параметр --test-disk можна використовувати лише один раз"
 
-#, c-format
 #~ msgid "--test-disk must be an absolute path"
 #~ msgstr "шлях у --test-disk слід вказувати як абсолютний"
 
-#, c-format
 #~ msgid "%s: unused arguments on the command line\n"
 #~ msgstr "%s: невикористані аргументи у командному рядку\n"
 
-#, c-format
 #~ msgid ""
 #~ "gtk_init_check returned false, indicating that\n"
 #~ "a GUI is not possible on this host.  Check X11, $DISPLAY etc."
@@ -10423,23 +10386,18 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "на цій основній системі графічний інтерфейс неможливий. Перевірте "
 #~ "наявність X11, $DISPLAY тощо."
 
-#, c-format
 #~ msgid "--nbd option appears multiple times"
 #~ msgstr "Параметр --nbd вказано декілька разів"
 
-#, c-format
 #~ msgid "malloc"
 #~ msgstr "malloc"
 
-#, c-format
 #~ msgid "--nbd option cannot be empty"
 #~ msgstr "Аргумент --nbd не може бути порожнім"
 
-#, c-format
 #~ msgid "--nbd: unknown server: %s"
 #~ msgstr "--nbd: невідомий сервер: %s"
 
-#, c-format
 #~ msgid ""
 #~ "%s: no working NBD server was found, cannot continue.\n"
 #~ "Please check the --nbd option in the virt-p2v(1) man page.\n"
@@ -10448,7 +10406,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "Будь ласка, ознайомтеся із документацією щодо параметра --nbd у "
 #~ "підручнику (man) з virt-p2v(1).\n"
 
-#, c-format
 #~ msgid ""
 #~ "%s: Run a rescue shell on a virtual machine\n"
 #~ "Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -10507,7 +10464,6 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "libguestfs\n"
 #~ "Щоб дізнатися більше, ознайомтеся зі сторінкою довідника (man) %s(1).\n"
 
-#, c-format
 #~ msgid ""
 #~ "libguestfs-test-tool: interactive test tool\n"
 #~ "Copyright (C) 2009-2019 Red Hat Inc.\n"
@@ -10535,15 +10491,12 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "  --version\n"
 #~ "  -V             Показати дані щодо версії libguestfs і завершити роботу\n"
 
-#, c-format
 #~ msgid "cannot open libvirt connection ‘%s’"
 #~ msgstr "не вдалося відкрити з’єднання libvirt «%s»"
 
-#, c-format
 #~ msgid "cannot open libvirt connection"
 #~ msgstr "не вдалося відкрити з’єднання libvirt"
 
-#, c-format
 #~ msgid ""
 #~ "cannot find libvirt pool ‘%s’: %s\n"
 #~ "\n"
@@ -10561,11 +10514,9 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "Щоб встановити буфер, який використовуватиме virt-v2v, додайте параметр «-"
 #~ "os <буфер>»."
 
-#, c-format
 #~ msgid "cannot find libvirt domain ‘%s’: %s"
 #~ msgstr "не вдалося знайти домен libvirt «%s»: %s"
 
-#, c-format
 #~ msgid ""
 #~ "libvirt domain ‘%s’ is running or paused.  It must be shut down in order "
 #~ "to perform virt-v2v conversion"
@@ -10573,26 +10524,20 @@ msgstr "virt-win-reg: {p}: не вдалося вивантажити файл 
 #~ "Домен libvirt «%s» працює або його призупинено. Роботу домену слід "
 #~ "завершити для виконання перетворення virt-v2v"
 
-#, c-format
 #~ msgid "cannot fetch XML description of guest ‘%s’: %s"
 #~ msgstr "не вдалося отримати опис XML гостьової системи «%s»: %s"
 
-#, c-format
 #~ msgid "cannot fetch XML description of pool ‘%s’: %s"
 #~ msgstr "не вдалося отримати опис XML буфера «%s»: %s"
 
-#, c-format
 #~ msgid "cannot find libvirt volume ‘%s’: %s"
 #~ msgstr "не вдалося знайти том libvirt «%s»: %s"
 
-#, c-format
 #~ msgid "cannot fetch XML description of volume ‘%s’: %s"
 #~ msgstr "не вдалося отримати опис XML тому «%s»: %s"
 
-#, c-format
 #~ msgid "cannot get libvirt hypervisor capabilities: %s"
 #~ msgstr "не вдалося отримати список можливостей гіпервізора libvirt: %s"
 
-#, c-format
 #~ msgid "cannot get libvirt library version: %s"
 #~ msgstr "Не вдалося отримати дані щодо версії бібліотеки libvirt: %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 81866e759..6d7923bd8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs 1.39.12\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2020-07-06 15:46+0100\n"
+"POT-Creation-Date: 2020-08-12 15:34+0200\n"
 "PO-Revision-Date: 2015-02-21 10:55+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
@@ -21,45 +21,45 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: ../dib/elements.ml:155
+#: dib/elements.ml:155
 msgid "  %s: already provided by %s"
 msgstr ""
 
-#: ../resize/resize.ml:980
+#: resize/resize.ml:980
 msgid "  An extra partition will be created for the surplus."
 msgstr ""
 
-#: ../resize/resize.ml:954 ../resize/resize.ml:923
+#: resize/resize.ml:954 resize/resize.ml:923
 msgid "  The %s on %s will be expanded using the ‘%s’ method."
 msgstr ""
 
-#: ../resize/resize.ml:982
+#: resize/resize.ml:982
 msgid ""
 "  The surplus space is not large enough for an extra partition to be created "
 "and so it will just be ignored."
 msgstr ""
 
-#: ../resize/resize.ml:984
+#: resize/resize.ml:984
 msgid ""
 "  The surplus space will be ignored.  Run a partitioning program in the "
 "guest to partition this extra space if you want."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:187
+#: common/mltools/tools_utils.ml:187
 msgid "%s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:73
+#: common/mltools/getopt.ml:73
 msgid ""
 "%s\n"
 "Options:\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:446 ../common/mltools/tools_utils.ml:640
+#: customize/customize_run.ml:446 common/mltools/tools_utils.ml:640
 msgid "%s (ignored)"
 msgstr ""
 
-#: ../builder/builder.ml:319
+#: builder/builder.ml:319
 msgid ""
 "%s checksum of template did not match the expected checksum!\n"
 "  found checksum: %s\n"
@@ -70,39 +70,39 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:71
+#: common/mltools/checksums.ml:71
 msgid "%s did not return any output"
 msgstr ""
 
-#: ../customize/customize_run.ml:244
+#: customize/customize_run.ml:244
 msgid "%s does not exist in the guest"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:59
+#: builder/simplestreams_parser.ml:59
 msgid "%s is not a Simple Streams (index) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../builder/simplestreams_parser.ml:78
+#: builder/simplestreams_parser.ml:78
 msgid "%s is not a Simple Streams (products) v1.0 JSON file (format: %s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:247
+#: customize/customize_run.ml:247
 msgid "%s is not a regular file in the guest"
 msgstr ""
 
-#: ../dib/utils.ml:97
+#: dib/utils.ml:97
 msgid "%s needed but not found"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:183 ../common/mltools/tools_utils.ml:155
+#: common/mltools/tools_utils.ml:183 common/mltools/tools_utils.ml:155
 msgid "%s: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:185
+#: common/mltools/tools_utils.ml:185
 msgid "%s: %s: %s"
 msgstr ""
 
-#: ../resize/resize.ml:706
+#: resize/resize.ml:706
 msgid ""
 "%s: This extended partition contains logical partitions which might be "
 "damaged by shrinking it.  If you want to shrink this partition, you need to "
@@ -111,11 +111,11 @@ msgid ""
 "line.)"
 msgstr ""
 
-#: ../resize/resize.ml:951
+#: resize/resize.ml:951
 msgid "%s: This logical volume will be expanded to maximum size."
 msgstr ""
 
-#: ../resize/resize.ml:702
+#: resize/resize.ml:702
 msgid ""
 "%s: This partition contains a %s filesystem which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -124,7 +124,7 @@ msgid ""
 "‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:698
+#: resize/resize.ml:698
 msgid ""
 "%s: This partition contains an LVM physical volume which will be damaged by "
 "shrinking it below %Ld bytes (user asked to shrink it to %Ld bytes).  If you "
@@ -133,7 +133,7 @@ msgid ""
 "‘%s‘ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:695
+#: resize/resize.ml:695
 msgid ""
 "%s: This partition has unknown content which might be damaged by shrinking "
 "it.  If you want to shrink this partition, you need to use the ‘--resize-"
@@ -141,25 +141,25 @@ msgid ""
 "error came from ‘%s’ option on the command line.)"
 msgstr ""
 
-#: ../resize/resize.ml:916
+#: resize/resize.ml:916
 msgid ""
 "%s: This partition will be created, but the contents will be ignored (ie. "
 "not copied to the target)."
 msgstr ""
 
-#: ../resize/resize.ml:918
+#: resize/resize.ml:918
 msgid "%s: This partition will be deleted."
 msgstr ""
 
-#: ../resize/resize.ml:914
+#: resize/resize.ml:914
 msgid "%s: This partition will be left alone."
 msgstr ""
 
-#: ../resize/resize.ml:920
+#: resize/resize.ml:920
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:178
+#: builder/cmdline.ml:178
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -175,35 +175,35 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:145
+#: builder/index_parser.ml:145
 msgid "%s: cannot determine the virtual size of %s due to compression"
 msgstr ""
 
-#: ../builder/index_parser.ml:171
+#: builder/index_parser.ml:171
 msgid "%s: cannot parse ‘compressed_size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: builder/index_parser.ml:196
 msgid "%s: cannot parse ‘hidden’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:132
+#: builder/index_parser.ml:132
 msgid "%s: cannot parse ‘revision’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:162
+#: builder/index_parser.ml:162
 msgid "%s: cannot parse ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:246
+#: builder/index_parser.ml:246
 msgid "%s: cannot use a URI (‘%s’) in the index file\n"
 msgstr ""
 
-#: ../customize/customize_run.ml:67
+#: customize/customize_run.ml:67
 msgid "%s: command exited with an error"
 msgstr ""
 
-#: ../builder/repository_main.ml:62
+#: builder/repository_main.ml:62
 msgid ""
 "%s: create a repository for virt-builder\n"
 "\n"
@@ -213,7 +213,7 @@ msgid ""
 "read the man page virt-builder-repository(1).\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:94
+#: customize/customize_main.ml:94
 msgid ""
 "%s: customize a virtual machine\n"
 "\n"
@@ -225,11 +225,11 @@ msgid ""
 "read the man page virt-customize(1).\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:125
+#: common/mltools/tools_utils.ml:125
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:66
+#: get-kernel/get_kernel.ml:66
 msgid ""
 "%s: extract kernel and ramdisk from a guest\n"
 "\n"
@@ -237,91 +237,91 @@ msgid ""
 "read the man page virt-get-kernel(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:415 ../resize/resize.ml:412
+#: resize/resize.ml:415 resize/resize.ml:412
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
 
-#: ../builder/index_parser.ml:76
+#: builder/index_parser.ml:76
 msgid "%s: index is corrupt: %s: field ‘%s[%s]’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:78
+#: builder/index_parser.ml:78
 msgid "%s: index is corrupt: %s: field ‘%s’ appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:60
+#: builder/index_parser.ml:60
 msgid ""
 "%s: index is corrupt: os-version ‘%s’ with architecture ‘%s’ appears two or "
 "more times\n"
 msgstr ""
 
-#: ../resize/resize.ml:852
+#: resize/resize.ml:852
 msgid ""
 "%s: logical volume not found in the source disk image (this error came from "
 "‘--lv-expand’ option on the command line).  Try running this command: virt-"
 "filesystems --logical-volumes --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:725
+#: resize/resize.ml:725
 msgid "%s: missing size field in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:734
+#: resize/resize.ml:734
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/index_parser.ml:109
+#: builder/index_parser.ml:109
 msgid "%s: no ‘arch’ entry for %s and failed to guess it\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:116
+#: builder/index_parser.ml:116
 msgid "%s: no ‘arch’ entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:97
+#: builder/index_parser.ml:97
 msgid "%s: no ‘file’ (URI) entry for ‘%s’\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:155
+#: builder/index_parser.ml:155
 msgid "%s: no ‘size’ field for ‘%s’\n"
 msgstr ""
 
-#: ../builder/sources.ml:48
+#: builder/sources.ml:48
 msgid "%s: no ‘uri’ entry for ‘%s’ in %s, skipping it\n"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:673
+#: common/mltools/tools_utils.ml:673
 msgid "%s: operation timed out"
 msgstr ""
 
-#: ../resize/resize.ml:646
+#: resize/resize.ml:646
 msgid "%s: partition already deleted, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:642
+#: resize/resize.ml:642
 msgid "%s: partition already ignored, you cannot use it in ‘%s’ option"
 msgstr ""
 
-#: ../resize/resize.ml:638
+#: resize/resize.ml:638
 msgid ""
 "%s: partition not found in the source disk image (this error came from ‘%s’ "
 "option on the command line).  Try running this command: virt-filesystems --"
 "partitions --long -a %s"
 msgstr ""
 
-#: ../resize/resize.ml:543
+#: resize/resize.ml:543
 msgid "%s: partition size %Ld < filesystem size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:538
+#: resize/resize.ml:538
 msgid "%s: partition size %Ld < physical volume size %Ld"
 msgstr ""
 
-#: ../resize/resize.ml:450
+#: resize/resize.ml:450
 msgid "%s: physical volume not returned by pvs_full"
 msgstr ""
 
-#: ../sysprep/main.ml:141
+#: sysprep/main.ml:141
 msgid ""
 "%s: reset or unconfigure a virtual machine so clones can be made\n"
 "\n"
@@ -333,7 +333,7 @@ msgid ""
 "read the man page virt-sysprep(1).\n"
 msgstr ""
 
-#: ../resize/resize.ml:219
+#: resize/resize.ml:219
 msgid ""
 "%s: resize a virtual machine disk\n"
 "\n"
@@ -341,7 +341,7 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../dib/cmdline.ml:63
+#: dib/cmdline.ml:63
 msgid ""
 "%s: run diskimage-builder elements to generate images\n"
 "\n"
@@ -351,7 +351,7 @@ msgid ""
 "read the man page virt-dib(1).\n"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:81
+#: sparsify/cmdline.ml:81
 msgid ""
 "%s: sparsify a virtual machine disk\n"
 "\n"
@@ -363,268 +363,268 @@ msgid ""
 "read the man page virt-sparsify(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:322
+#: builder/builder.ml:322
 msgid ""
 "%s: template not downloaded or deleted.  You may have run ‘virt-builder --"
 "delete-cache’ in parallel."
 msgstr ""
 
-#: ../resize/resize.ml:680
+#: resize/resize.ml:680
 msgid "%s: this partition has already been ignored or deleted"
 msgstr ""
 
-#: ../resize/resize.ml:676
+#: resize/resize.ml:676
 msgid "%s: this partition has already been marked for resizing"
 msgstr ""
 
-#: ../resize/resize.ml:553
+#: resize/resize.ml:553
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
-#: ../resize/resize.ml:427
+#: resize/resize.ml:427
 msgid ""
 "%s: unknown partition table type\n"
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:144
+#: common/mltools/tools_utils.ml:144
 msgid "%s: warning: %s"
 msgstr ""
 
-#: ../builder/index_parser.ml:250
+#: builder/index_parser.ml:250
 msgid "%s: you must use relative paths (not ‘%s’) in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:242
+#: builder/index_parser.ml:242
 msgid "%s: zero length path in the index file\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:331
-#. ../common/mlcustomize/customize_cmdline.ml:240
-#: ../customize/customize_cmdline.ml:331 ../customize/customize_cmdline.ml:240
+#. common/mlcustomize/customize_cmdline.ml:331
+#. common/mlcustomize/customize_cmdline.ml:240
+#: customize/customize_cmdline.ml:331 customize/customize_cmdline.ml:240
 msgid "'CMD+ARGS'"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:40
+#: get-kernel/get_kernel.ml:40
 msgid "--add option can only be given once"
 msgstr ""
 
-#: ../customize/customize_run.ml:206
+#: customize/customize_run.ml:206
 msgid ""
 "--append-line: line must not contain newline characters.  Use the --append-"
 "line option multiple times to add several lines."
 msgstr ""
 
-#: ../customize/customize_main.ml:112
+#: customize/customize_main.ml:112
 msgid "--attach-format parameter must appear before --attach parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: builder/cmdline.ml:266
 msgid ""
 "--cache-all-templates/--print-cache/--delete-cache does not need any extra "
 "arguments"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:55
+#: sparsify/cmdline.ml:55
 msgid "--check-tmpdir: unknown argument ‘%s’"
 msgstr ""
 
-#: ../sparsify/copying.ml:69
+#: sparsify/copying.ml:69
 msgid ""
 "--compress cannot be used for raw output.  Remove this option or use --"
 "convert qcow2."
 msgstr ""
 
-#: ../dib/cmdline.ml:88
+#: dib/cmdline.ml:88
 msgid "--debug parameter must be >= 0"
 msgstr ""
 
-#. ../customize/customize_main.ml:70
-#: ../sysprep/main.ml:66 ../get-kernel/get_kernel.ml:48
+#: sysprep/main.ml:66 get-kernel/get_kernel.ml:48
+#: customize/customize_main.ml:70
 msgid "--domain option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:76
+#: sysprep/main.ml:76
 msgid "--enable option can only be given once"
 msgstr ""
 
-#: ../sysprep/main.ml:84
+#: sysprep/main.ml:84
 msgid "--enable: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../resize/resize.ml:173
+#: resize/resize.ml:173
 msgid "--expand option given more than once"
 msgstr ""
 
-#: ../sysprep/main.ml:156 ../customize/customize_main.ml:109
+#: sysprep/main.ml:156 customize/customize_main.ml:109
 msgid "--format parameter must appear before -a parameter"
 msgstr ""
 
-#: ../builder/cmdline.ml:274
+#: builder/cmdline.ml:274
 msgid "--get-kernel: too many parameters"
 msgstr ""
 
-#: ../customize/customize_run.ml:101 ../customize/customize_run.ml:99
+#: customize/customize_run.ml:101 customize/customize_run.ml:99
 msgid "--install"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: builder/cmdline.ml:245
 msgid "--list: use ‘--list-format’, not ‘--format’"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: builder/cmdline.ml:258
 msgid "--notes: too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../sysprep/main.ml:103
+#: sysprep/main.ml:103
 msgid "--operations: empty operation name"
 msgstr ""
 
-#: ../sysprep/main.ml:114
+#: sysprep/main.ml:114
 msgid "--operations: ‘%s’ is not a known operation"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:52
+#: get-kernel/get_kernel.ml:52
 msgid "--prefix option can only be given once"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:35
+#: sysprep/sysprep_operation_script.ml:35
 msgid "--scriptdir cannot be used more than once"
 msgstr ""
 
-#: ../resize/resize.ml:188
+#: resize/resize.ml:188
 msgid "--shrink option given more than once"
 msgstr ""
 
-#: ../sparsify/copying.ml:89
+#: sparsify/copying.ml:89
 msgid ""
 "--tmp parameter must point to a directory, block device or prebuilt file"
 msgstr ""
 
-#: ../sparsify/copying.ml:80
+#: sparsify/copying.ml:80
 msgid "--tmp prebuilt:file: %s: file does not exist"
 msgstr ""
 
-#: ../sparsify/copying.ml:85
+#: sparsify/copying.ml:85
 msgid "--tmp prebuilt:file: %s: file does not have backing file"
 msgstr ""
 
-#: ../sparsify/copying.ml:83
+#: sparsify/copying.ml:83
 msgid "--tmp prebuilt:file: %s: file format is not qcow2"
 msgstr ""
 
-#: ../customize/customize_run.ml:155 ../customize/customize_run.ml:153
+#: customize/customize_run.ml:155 customize/customize_run.ml:153
 msgid "--uninstall"
 msgstr ""
 
-#: ../customize/customize_run.ml:131 ../customize/customize_run.ml:129
+#: customize/customize_run.ml:131 customize/customize_run.ml:129
 msgid "--update"
 msgstr ""
 
-#: ../dib/cmdline.ml:241
+#: dib/cmdline.ml:241
 msgid "-B must be specified"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "Add disk image file"
 msgstr ""
 
-#: ../dib/cmdline.ml:171
+#: dib/cmdline.ml:171
 msgid "Add extra packages to install"
 msgstr ""
 
-#: ../dib/cmdline.ml:169
+#: dib/cmdline.ml:169
 msgid "Add mkfs options"
 msgstr ""
 
-#: ../dib/cmdline.ml:158
+#: dib/cmdline.ml:158
 msgid "Add new a elements location"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:269
-#: ../customize/customize_cmdline.ml:269
+#: customize/customize_cmdline.ml:269
+#: common/mlcustomize/customize_cmdline.ml:269
 msgid "Add package(s) to install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:252
-#: ../customize/customize_cmdline.ml:252
+#: customize/customize_cmdline.ml:252
+#: common/mlcustomize/customize_cmdline.ml:252
 msgid "Add package(s) to install at first boot"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74 ../dib/output_format_qcow2.ml:50
+#: sparsify/cmdline.ml:74 dib/output_format_qcow2.ml:50
 msgid "Add qemu-img options"
 msgstr ""
 
-#: ../builder/list_entries.ml:83
+#: builder/list_entries.ml:83
 msgid "Aliases:"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/repository_main.ml:214
+#: builder/repository_main.ml:214
 msgid "Allowed characters are letters, digits, - _ and ."
 msgstr ""
 
-#: ../builder/repository_main.ml:277
+#: builder/repository_main.ml:277
 msgid "Already existing image with id %s and architecture %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:168
-#: ../customize/customize_cmdline.ml:168
+#: customize/customize_cmdline.ml:168
+#: common/mlcustomize/customize_cmdline.ml:168
 msgid "Append line(s) to the file"
 msgstr ""
 
-#: ../customize/customize_run.ml:208
+#: customize/customize_run.ml:208
 msgid "Appending line to %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:77
+#: builder/list_entries.ml:77
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/repository_main.ml:221
+#: builder/repository_main.ml:221
 msgid "Architecture: "
 msgstr ""
 
-#: ../builder/repository_main.ml:55
+#: builder/repository_main.ml:55
 msgid "Ask the user about missing data"
 msgstr ""
 
-#: ../customize/customize_main.ml:76 ../builder/cmdline.ml:130
+#: customize/customize_main.ml:76 builder/cmdline.ml:130
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:349
-#: ../customize/customize_cmdline.ml:349
+#: customize/customize_cmdline.ml:349
+#: common/mlcustomize/customize_cmdline.ml:349
 msgid "Attach to a subscription-manager pool"
 msgstr ""
 
-#: ../customize/customize_run.ml:310
+#: customize/customize_run.ml:310
 msgid "Attaching to compatible subscriptions"
 msgstr ""
 
-#: ../customize/customize_run.ml:314
+#: customize/customize_run.ml:314
 msgid "Attaching to the pool %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:194
+#: dib/cmdline.ml:194
 msgid "Base path of diskimage-builder library"
 msgstr ""
 
-#: ../sparsify/copying.ml:340
+#: sparsify/copying.ml:340
 msgid ""
 "Before deleting the old disk, carefully check that the target disk boots and "
 "works correctly."
 msgstr ""
 
-#: ../resize/resize.ml:214
+#: resize/resize.ml:214
 msgid "Behaviour on expand unknown filesystems (default: warn)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:105
+#: sysprep/sysprep_operation_user_account.ml:105
 msgid ""
 "By default remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed.\n"
@@ -633,417 +633,415 @@ msgid ""
 "how to remove only some users, or to not remove some others."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:83
+#: sysprep/sysprep_operation_user_account.ml:83
 msgid "Cannot get the home directory for %s"
 msgstr ""
 
-#: ../dib/dib.ml:592
+#: dib/dib.ml:592
 msgid "Carried environment variables: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:163
+#: dib/cmdline.ml:163
 msgid "Carry/set this environment variable"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
+#: sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: sysprep/sysprep_operation_fs_uuids.ml:48
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:179
-#: ../customize/customize_cmdline.ml:179
+#: customize/customize_cmdline.ml:179
+#: common/mlcustomize/customize_cmdline.ml:179
 msgid "Change the permissions of a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:212
+#: customize/customize_run.ml:212
 msgid "Changing permissions of %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:138
+#: builder/cmdline.ml:138
 msgid "Check digital signatures"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:68
+#: sparsify/cmdline.ml:68
 msgid "Check there is enough space in $TMPDIR"
 msgstr ""
 
-#: ../builder/repository_main.ml:200
+#: builder/repository_main.ml:200
 msgid ""
 "Choose one from the list below:\n"
 " %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:119 ../sparsify/copying.ml:271
+#: sparsify/in_place.ml:119 sparsify/copying.ml:271
 msgid "Clearing Linux swap on %s"
 msgstr ""
 
-#: ../sysprep/main.ml:136
+#: sysprep/main.ml:136
 msgid "Compatibility option, does nothing"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:69
+#: sparsify/cmdline.ml:69
 msgid "Compressed output format"
 msgstr ""
 
-#: ../dib/output_format_squashfs.ml:28
+#: dib/output_format_squashfs.ml:28
 msgid "Compressing the image as squashfs"
 msgstr ""
 
-#: ../dib/output_format_tar.ml:25
+#: dib/output_format_tar.ml:25
 msgid "Compressing the image as tar"
 msgstr ""
 
-#: ../dib/output_format_tgz.ml:25
+#: dib/output_format_tgz.ml:25
 msgid "Compressing the image as tar.gz"
 msgstr ""
 
-#: ../builder/builder.ml:683
+#: builder/builder.ml:683
 msgid "Converting %s to %s"
 msgstr ""
 
-#: ../builder/builder.ml:682
+#: builder/builder.ml:682
 msgid "Converting to %s"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:29
+#: dib/output_format_vhd.ml:29
 msgid "Converting to VHD"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:35
+#: dib/output_format_qcow2.ml:35
 msgid "Converting to qcow2"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:201
-#: ../customize/customize_cmdline.ml:201
+#: customize/customize_cmdline.ml:201
+#: common/mlcustomize/customize_cmdline.ml:201
 msgid "Copy files in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:212
-#: ../customize/customize_cmdline.ml:212
+#: customize/customize_cmdline.ml:212
+#: common/mlcustomize/customize_cmdline.ml:212
 msgid "Copy local files or directories into image"
 msgstr ""
 
-#: ../builder/builder.ml:618
+#: builder/builder.ml:618
 msgid "Copying"
 msgstr ""
 
-#: ../resize/resize.ml:1246
+#: resize/resize.ml:1246
 msgid "Copying %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:229
+#: customize/customize_run.ml:229
 msgid "Copying (in image): %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:233
+#: customize/customize_run.ml:233
 msgid "Copying: %s to %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:286
-#: ../customize/customize_cmdline.ml:286
+#: customize/customize_cmdline.ml:286
+#: common/mlcustomize/customize_cmdline.ml:286
 msgid "Create a directory"
 msgstr ""
 
-#: ../sparsify/copying.ml:145
+#: sparsify/copying.ml:145
 msgid "Create overlay device %s to protect source disk"
 msgstr ""
 
-#: ../sparsify/copying.ml:143
+#: sparsify/copying.ml:143
 msgid "Create overlay file in %s to protect source disk"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:280
-#: ../customize/customize_cmdline.ml:280
+#: customize/customize_cmdline.ml:280
+#: common/mlcustomize/customize_cmdline.ml:280
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../builder/repository_main.ml:559
+#: builder/repository_main.ml:559
 msgid "Creating index backup copy"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:474
-#: ../customize/customize_cmdline.ml:474
+#: customize/customize_cmdline.ml:474
+#: common/mlcustomize/customize_cmdline.ml:474
 msgid "Credentials for subscription-manager"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:42
+#: sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
+#: sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:43
+#: sysprep/sysprep_operation_customize.ml:43
 msgid "Customize the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_customize.ml:44
+#: sysprep/sysprep_operation_customize.ml:44
 msgid ""
 "Customize the guest by providing L<virt-customize(1)> options\n"
 "for installing packages, editing files and so on."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:285
-#: ../customize/customize_cmdline.ml:285
+#: customize/customize_cmdline.ml:285
+#: common/mlcustomize/customize_cmdline.ml:285
 msgid "DIR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:218
-#: ../customize/customize_cmdline.ml:218
+#: customize/customize_cmdline.ml:218
+#: common/mlcustomize/customize_cmdline.ml:218
 msgid "Delete a file or directory"
 msgstr ""
 
-#: ../resize/resize.ml:199
+#: resize/resize.ml:199
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:143
+#: builder/cmdline.ml:143
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../customize/customize_run.ml:237 ../builder/builder.ml:138
+#: customize/customize_run.ml:237 builder/builder.ml:138
 msgid "Deleting: %s"
 msgstr ""
 
-#. ../builder/cmdline.ml:158
-#: ../dib/cmdline.ml:188 ../customize/customize_main.ml:85
+#: dib/cmdline.ml:188 customize/customize_main.ml:85 builder/cmdline.ml:158
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../sysprep/main.ml:134
+#: sysprep/main.ml:134
 msgid "Disable appliance network (default)"
 msgstr ""
 
-#: ../builder/cmdline.ml:140
+#: builder/cmdline.ml:140
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: builder/cmdline.ml:134
 msgid "Disable template cache"
 msgstr ""
 
-#: ../sparsify/in_place.ml:154
+#: sparsify/in_place.ml:154
 msgid "Discard space in volgroup %s"
 msgstr ""
 
-#: ../common/mltools/getopt.ml:229
+#: common/mltools/getopt.ml:229
 msgid "Display brief help"
 msgstr ""
 
-#: ../builder/cmdline.ml:159
+#: builder/cmdline.ml:159
 msgid "Display installation notes"
 msgstr ""
 
-#: ../builder/repository_main.ml:284
+#: builder/repository_main.ml:284
 msgid "Display name: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:332
+#: common/mltools/tools_utils.ml:332
 msgid "Display version and exit"
 msgstr ""
 
-#: ../dib/output_format_qcow2.ml:49
+#: dib/output_format_qcow2.ml:49
 msgid "Do not compress the qcow2 image"
 msgstr ""
 
-#: ../builder/cmdline.ml:166
+#: builder/cmdline.ml:166
 msgid "Do not fsync output file on exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:168
+#: builder/cmdline.ml:168
 msgid "Do not warn if writing to a partition"
 msgstr ""
 
-#: ../dib/dib.ml:1005
+#: dib/dib.ml:1005
 msgid "Done"
 msgstr ""
 
-#: ../builder/repository_main.ml:56
+#: builder/repository_main.ml:56
 msgid "Don’t compress the new images in the index"
 msgstr ""
 
-#: ../resize/resize.ml:197
+#: resize/resize.ml:197
 msgid "Don’t copy boot loader"
 msgstr ""
 
-#: ../resize/resize.ml:202
+#: resize/resize.ml:202
 msgid "Don’t create extra partition"
 msgstr ""
 
-#: ../dib/cmdline.ml:191 ../builder/cmdline.ml:145
+#: dib/cmdline.ml:191 builder/cmdline.ml:145
 msgid "Don’t delete output file on failure"
 msgstr ""
 
-#: ../resize/resize.ml:201
+#: resize/resize.ml:201
 msgid "Don’t expand content"
 msgstr ""
 
-#: ../resize/resize.ml:206
+#: resize/resize.ml:206
 msgid "Don’t perform changes"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:336
+#: common/mltools/tools_utils.ml:336
 msgid "Don’t print progress messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:354
+#: common/mltools/tools_utils.ml:354
 msgid "Don’t turn off echo for passphrases"
 msgstr ""
 
-#: ../builder/cmdline.ml:136
+#: builder/cmdline.ml:136
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:80
+#: builder/list_entries.ml:80
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:304 ../builder/builder.ml:256
+#: builder/builder.ml:304 builder/builder.ml:256
 msgid "Downloading: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:229
-#: ../customize/customize_cmdline.ml:229
+#: customize/customize_cmdline.ml:229
+#: common/mlcustomize/customize_cmdline.ml:229
 msgid "Edit file using Perl expression"
 msgstr ""
 
-#: ../customize/customize_run.ml:241
+#: customize/customize_run.ml:241
 msgid "Editing: %s"
 msgstr ""
 
-#: ../dib/dib.ml:565
+#: dib/dib.ml:565
 msgid "Elements: %s"
 msgstr ""
 
-#: ../sysprep/main.ml:133
+#: sysprep/main.ml:133
 msgid "Enable appliance network"
 msgstr ""
 
-#. ../builder/cmdline.ml:157
-#: ../dib/cmdline.ml:187 ../customize/customize_main.ml:84
+#: dib/cmdline.ml:187 customize/customize_main.ml:84 builder/cmdline.ml:157
 msgid "Enable appliance network (default)"
 msgstr ""
 
-#: ../resize/resize.ml:198
+#: resize/resize.ml:198
 msgid "Enable debugging messages"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:333
+#: common/mltools/tools_utils.ml:333
 msgid "Enable libguestfs debugging messages"
 msgstr ""
 
-#: ../sysprep/main.ml:129
+#: sysprep/main.ml:129
 msgid "Enable specific operations"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:334
+#: common/mltools/tools_utils.ml:334
 msgid "Enable tracing of libguestfs calls"
 msgstr ""
 
-#: ../sysprep/main.ml:137
+#: sysprep/main.ml:137
 msgid "Enable/disable specific operations"
 msgstr ""
 
-#: ../sparsify/copying.ml:173
+#: sparsify/copying.ml:173
 msgid "Examine source disk"
 msgstr ""
 
-#: ../resize/resize.ml:379
+#: resize/resize.ml:379
 msgid "Examining %s"
 msgstr ""
 
-#: ../sysprep/main.ml:209 ../customize/customize_main.ml:155
+#: sysprep/main.ml:209 customize/customize_main.ml:155
 msgid "Examining the guest ..."
 msgstr ""
 
-#: ../dib/cmdline.ml:160
+#: dib/cmdline.ml:160
 msgid "Exclude the specified element"
 msgstr ""
 
-#: ../dib/cmdline.ml:162
+#: dib/cmdline.ml:162
 msgid "Exclude the specified script"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "Expand logical volume"
 msgstr ""
 
-#: ../resize/resize.ml:200
+#: resize/resize.ml:200
 msgid "Expand partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:312 ../builder/repository_main.ml:305
+#: builder/repository_main.ml:312 builder/repository_main.ml:305
 msgid "Expandable partition: "
 msgstr ""
 
-#: ../builder/repository_main.ml:331 ../builder/repository_main.ml:324
+#: builder/repository_main.ml:331 builder/repository_main.ml:324
 msgid "Expandable volume: "
 msgstr ""
 
-#: ../dib/dib.ml:588
+#: dib/dib.ml:588
 msgid "Expanded elements: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1413
+#: resize/resize.ml:1413
 msgid "Expanding %s using the ‘%s’ method"
 msgstr ""
 
-#: ../resize/resize.ml:1394
+#: resize/resize.ml:1394
 msgid "Expanding %s%s using the ‘%s’ method"
 msgstr ""
 
-#: ../builder/repository_main.ml:232
+#: builder/repository_main.ml:232
 msgid "Extracting data from the image..."
 msgstr ""
 
-#: ../dib/dib.ml:936
+#: dib/dib.ml:936
 msgid "Extracting data out of the image"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:337
-#. ../common/mlcustomize/customize_cmdline.ml:402
-#. ../common/mlcustomize/customize_cmdline.ml:384
-#. ../common/mlcustomize/customize_cmdline.ml:337
-#: ../customize/customize_cmdline.ml:402 ../customize/customize_cmdline.ml:384
+#. customize/customize_cmdline.ml:337
+#. common/mlcustomize/customize_cmdline.ml:402
+#. common/mlcustomize/customize_cmdline.ml:384
+#. common/mlcustomize/customize_cmdline.ml:337
+#: customize/customize_cmdline.ml:402 customize/customize_cmdline.ml:384
 msgid "FILE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:437
-#: ../customize/customize_cmdline.ml:437
+#: customize/customize_cmdline.ml:437
+#: common/mlcustomize/customize_cmdline.ml:437
 msgid "FILE:CONTENT"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:426
-#: ../customize/customize_cmdline.ml:426
+#: customize/customize_cmdline.ml:426
+#: common/mlcustomize/customize_cmdline.ml:426
 msgid "FILE:DEST"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:224
-#: ../customize/customize_cmdline.ml:224
+#: customize/customize_cmdline.ml:224
+#: common/mlcustomize/customize_cmdline.ml:224
 msgid "FILE:EXPR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:163
-#: ../customize/customize_cmdline.ml:163
+#: customize/customize_cmdline.ml:163
+#: common/mlcustomize/customize_cmdline.ml:163
 msgid "FILE:LINE"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:185
-#: ../customize/customize_cmdline.ml:185
+#: customize/customize_cmdline.ml:185
+#: common/mlcustomize/customize_cmdline.ml:185
 msgid "FILENAME"
 msgstr ""
 
-#: ../resize/resize.ml:1041
+#: resize/resize.ml:1041
 msgid ""
 "Failed to initialize the partition table on the target disk.  You need to "
 "wipe or recreate the target disk and then run virt-resize again.\n"
@@ -1051,102 +1049,101 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:179
+#: dib/cmdline.ml:179
 msgid "Filesystem for the image"
 msgstr ""
 
-#: ../sparsify/copying.ml:256
+#: sparsify/copying.ml:256
 msgid "Fill free space in %s with zero"
 msgstr ""
 
-#: ../sparsify/copying.ml:304
+#: sparsify/copying.ml:304
 msgid "Fill free space in volgroup %s with zero"
 msgstr ""
 
-#: ../builder/cmdline.ml:147
+#: builder/cmdline.ml:147
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:64
+#: builder/list_entries.ml:64
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../customize/customize_main.ml:198 ../builder/builder.ml:768
+#: customize/customize_main.ml:198 builder/builder.ml:768
 msgid "Finishing off"
 msgstr ""
 
-#: ../resize/resize.ml:1292
+#: resize/resize.ml:1292
 msgid "Fixing first NTFS partition boot record"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:54
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:52
+#. sysprep/sysprep_operation_net_hostname.ml:54
+#: sysprep/sysprep_operation_net_hwaddr.ml:52
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "For Linux guests, this touches C</.unconfigured>, which causes\n"
 "the first boot to interactively query the user for settings such\n"
 "as the root password and timezone."
 msgstr ""
 
-#: ../resize/resize.ml:207
+#: resize/resize.ml:207
 msgid "Force ntfsresize"
 msgstr ""
 
-#: ../resize/resize.ml:210
+#: resize/resize.ml:210
 msgid "Forcefully resize partition"
 msgstr ""
 
-#. ../get-kernel/get_kernel.ml:60
-#: ../sparsify/cmdline.ml:71 ../resize/resize.ml:203
+#: sparsify/cmdline.ml:71 resize/resize.ml:203 get-kernel/get_kernel.ml:60
 msgid "Format of input disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:184
+#: dib/cmdline.ml:184
 msgid "Format of optional drive"
 msgstr ""
 
-#: ../resize/resize.ml:208
+#: resize/resize.ml:208
 msgid "Format of output disk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:70
+#: sparsify/cmdline.ml:70
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/repository_main.ml:494
+#: builder/repository_main.ml:494
 msgid "Found new images: %s"
 msgstr ""
 
-#: ../builder/builder.ml:758
+#: builder/builder.ml:758
 msgid "Free space"
 msgstr ""
 
-#: ../builder/list_entries.ml:76
+#: builder/list_entries.ml:76
 msgid "Full name:"
 msgstr ""
 
-#: ../builder/sigchecker.ml:110
+#: builder/sigchecker.ml:110
 msgid ""
 "GPG failure: could not run GPG the first time\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:65
+#: builder/sigchecker.ml:65
 msgid ""
 "GPG failure: could not trust the imported key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/sigchecker.ml:203
+#: builder/sigchecker.ml:203
 msgid ""
 "GPG failure: could not verify digital signature of file\n"
 "Try:\n"
@@ -1155,32 +1152,32 @@ msgid ""
 " - Check no one has tampered with the website or your network!"
 msgstr ""
 
-#: ../dib/cmdline.ml:172
+#: dib/cmdline.ml:172
 msgid "Generate MD5 and SHA256 checksum files"
 msgstr ""
 
-#: ../dib/dib.ml:984
+#: dib/dib.ml:984
 msgid "Generating checksums for %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:150
+#: builder/cmdline.ml:150
 msgid "Get kernel from image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:257
-#: ../customize/customize_cmdline.ml:257
+#: customize/customize_cmdline.ml:257
+#: common/mlcustomize/customize_cmdline.ml:257
 msgid "HOSTNAME"
 msgstr ""
 
-#: ../builder/repository_main.ml:54
+#: builder/repository_main.ml:54
 msgid "ID of the GPG key to sign the repo with"
 msgstr ""
 
-#: ../builder/repository_main.ml:212
+#: builder/repository_main.ml:212
 msgid "Identifier: "
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:130
+#: common/mltools/tools_utils.ml:130
 msgid ""
 "If reporting bugs, run %s with debugging enabled and include the complete "
 "output:\n"
@@ -1188,328 +1185,328 @@ msgid ""
 "  %s -v -x [...]"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:72
 msgid "Ignore filesystem"
 msgstr ""
 
-#: ../resize/resize.ml:204
+#: resize/resize.ml:204
 msgid "Ignore partition"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:39
+#: dib/output_format_docker.ml:39
 msgid "Importing the image to docker as ‘%s’"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:55
+#: sysprep/sysprep_operation_ca_certificates.ml:55
 msgid "In case any certificate is removed, the system CA store is updated."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:379
-#: ../customize/customize_cmdline.ml:379
+#: customize/customize_cmdline.ml:379
+#: common/mlcustomize/customize_cmdline.ml:379
 msgid "Inject a public key into the guest"
 msgstr ""
 
-#: ../dib/cmdline.ml:166
+#: dib/cmdline.ml:166
 msgid "Installation type"
 msgstr ""
 
-#: ../customize/customize_run.ml:252
+#: customize/customize_run.ml:252
 msgid "Installing firstboot command: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:256
+#: customize/customize_run.ml:256
 msgid "Installing firstboot packages: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:263
+#: customize/customize_run.ml:263
 msgid "Installing firstboot script: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:273
+#: customize/customize_run.ml:273
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../dib/dib.ml:514
+#: dib/dib.ml:514
 msgid "Installing: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:66
+#: builder/list_entries.ml:66
 msgid "Key: %s\n"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:207
-#: ../customize/customize_cmdline.ml:207
+#: customize/customize_cmdline.ml:207
+#: common/mlcustomize/customize_cmdline.ml:207
 msgid "LOCALPATH:REMOTEDIR"
 msgstr ""
 
-#: ../dib/cmdline.ml:165
+#: dib/cmdline.ml:165
 msgid "Label for the root fs"
 msgstr ""
 
-#: ../customize/customize_run.ml:280
+#: customize/customize_run.ml:280
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:152
+#: builder/cmdline.ml:152
 msgid "List available templates"
 msgstr ""
 
-#: ../sysprep/main.ml:131
+#: sysprep/main.ml:131
 msgid "List supported operations"
 msgstr ""
 
-#: ../dib/cmdline.ml:167
+#: dib/cmdline.ml:167
 msgid "Location for cached images"
 msgstr ""
 
-#: ../dib/cmdline.ml:176
+#: dib/cmdline.ml:176
 msgid "Main element for building ramdisks"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:361
+#: common/mltools/tools_utils.ml:361
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../customize/customize_run.ml:285
+#: customize/customize_run.ml:285
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:78
+#: builder/list_entries.ml:78
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:73
+#: sparsify/cmdline.ml:73
 msgid "Modify the disk image in-place"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:297
-#: ../customize/customize_cmdline.ml:297
+#: customize/customize_cmdline.ml:297
+#: common/mlcustomize/customize_cmdline.ml:297
 msgid "Move files in disk image"
 msgstr ""
 
-#: ../builder/repository_main.ml:568
+#: builder/repository_main.ml:568
 msgid "Moving files to final destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:289
+#: customize/customize_run.ml:289
 msgid "Moving: %s -> %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:178
+#: dib/cmdline.ml:178
 msgid "Name of the image"
 msgstr ""
 
-#: ../builder/repository_main.ml:490
+#: builder/repository_main.ml:490
 msgid "No new image found"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:196
+#: sysprep/sysprep_operation.ml:196
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:89
+#: builder/list_entries.ml:89
 msgid ""
 "Notes:\n"
 "\n"
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#. ../sysprep/sysprep_operation_logfiles.ml:149
-#: ../sysprep/sysprep_operation_passwd_backups.ml:48
+#. sysprep/sysprep_operation_logfiles.ml:149
+#: sysprep/sysprep_operation_passwd_backups.ml:48
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:49
+#: sysprep/sysprep_operation_fs_uuids.ml:49
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:253
+#: common/mlcustomize/firstboot.ml:253
 msgid ""
 "One of rhsrvany.exe or pvvxsvc.exe is missing in %s.  One of them is "
 "required in order to install Windows firstboot scripts.  You can get one by "
 "building rhsrvany (https://github.com/rwmjones/rhsrvany)"
 msgstr ""
 
-#: ../dib/dib.ml:717
+#: dib/dib.ml:717
 msgid "Opening the disks"
 msgstr ""
 
-#: ../builder/builder.ml:695
+#: builder/builder.ml:695
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../dib/cmdline.ml:183
+#: dib/cmdline.ml:183
 msgid "Optional drive for caches"
 msgstr ""
 
-#: ../dib/cmdline.ml:182
+#: dib/cmdline.ml:182
 msgid "Output architecture"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "Output directory"
 msgstr ""
 
-#: ../builder/builder.ml:753
+#: builder/builder.ml:753
 msgid "Output file"
 msgstr ""
 
-#: ../builder/builder.ml:755
+#: builder/builder.ml:755
 msgid "Output format"
 msgstr ""
 
-#: ../builder/cmdline.ml:148
+#: builder/cmdline.ml:148
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../dib/cmdline.ml:181
+#: dib/cmdline.ml:181
 msgid "Output formats"
 msgstr ""
 
-#: ../builder/builder.ml:754
+#: builder/builder.ml:754
 msgid "Output size"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:390
-#. ../common/mlcustomize/customize_cmdline.ml:217
-#: ../customize/customize_cmdline.ml:390 ../customize/customize_cmdline.ml:217
+#. common/mlcustomize/customize_cmdline.ml:390
+#. common/mlcustomize/customize_cmdline.ml:217
+#: customize/customize_cmdline.ml:390 customize/customize_cmdline.ml:217
 msgid "PATH"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:174
-#: ../customize/customize_cmdline.ml:174
+#: customize/customize_cmdline.ml:174
+#: common/mlcustomize/customize_cmdline.ml:174
 msgid "PERMISSIONS:FILE"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:247
-#. ../common/mlcustomize/customize_cmdline.ml:409
-#. ../common/mlcustomize/customize_cmdline.ml:264
-#. ../common/mlcustomize/customize_cmdline.ml:247
-#: ../customize/customize_cmdline.ml:409 ../customize/customize_cmdline.ml:264
+#. customize/customize_cmdline.ml:247
+#. common/mlcustomize/customize_cmdline.ml:409
+#. common/mlcustomize/customize_cmdline.ml:264
+#. common/mlcustomize/customize_cmdline.ml:247
+#: customize/customize_cmdline.ml:409 customize/customize_cmdline.ml:264
 msgid "PKG,PKG.."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:162
+#: sysprep/sysprep_operation.ml:162
 msgid "POD for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:171
+#: sysprep/sysprep_operation.ml:171
 msgid "POD notes for %s must not end with newline"
 msgstr ""
 
-#: ../sysprep/main.ml:126 ../customize/customize_main.ml:81
+#: sysprep/main.ml:126 customize/customize_main.ml:81
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:318 ../sysprep/sysprep_operation.ml:297
+#: sysprep/sysprep_operation.ml:318 sysprep/sysprep_operation.ml:297
 msgid "Performing %S ..."
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: builder/builder.ml:556
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "Prefix for files"
 msgstr ""
 
-#: ../builder/repository_main.ml:184
+#: builder/repository_main.ml:184
 msgid "Preparing %s"
 msgstr ""
 
-#: ../dib/dib.ml:612
+#: dib/dib.ml:612
 msgid "Preparing auxiliary data"
 msgstr ""
 
-#: ../builder/cmdline.ml:162
+#: builder/cmdline.ml:162
 msgid "Print info about template cache"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:190
-#: ../customize/customize_cmdline.ml:190
+#: customize/customize_cmdline.ml:190
+#: common/mlcustomize/customize_cmdline.ml:190
 msgid "Read customize commands from file"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:355
+#: common/mltools/tools_utils.ml:355
 msgid "Read passphrases from stdin"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:391
-#: ../customize/customize_cmdline.ml:391
+#: customize/customize_cmdline.ml:391
+#: common/mlcustomize/customize_cmdline.ml:391
 msgid "Recursively truncate all files in directory"
 msgstr ""
 
-#: ../customize/customize_run.ml:354
+#: customize/customize_run.ml:354
 msgid "Recursively truncating: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:355
-#: ../customize/customize_cmdline.ml:355
+#: customize/customize_cmdline.ml:355
+#: common/mlcustomize/customize_cmdline.ml:355
 msgid "Register using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:320
+#: customize/customize_run.ml:320
 msgid "Registering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:464
-#: ../customize/customize_cmdline.ml:464
+#: customize/customize_cmdline.ml:464
+#: common/mlcustomize/customize_cmdline.ml:464
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
+#: sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_passwd_backups.ml:46
+#: sysprep/sysprep_operation_passwd_backups.ml:46
 msgid "Remove /etc/passwd- and similar backup files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: sysprep/sysprep_operation_ca_certificates.ml:54
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
+#: sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
+#: sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:37
+#: sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:53
+#: sysprep/sysprep_operation_net_hostname.ml:53
 msgid "Remove HOSTNAME and DHCP_HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#: sysprep/sysprep_operation_net_hwaddr.ml:51
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:43
+#: sysprep/sysprep_operation_kerberos_data.ml:43
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:57
+#: sysprep/sysprep_operation_ipa_client.ml:57
 msgid ""
 "Remove all the files related to an IPA (Identity, Policy, Audit) system.\n"
 "This effectively unenrolls the guest from an IPA server without interacting\n"
@@ -1518,148 +1515,148 @@ msgid ""
 "This operation does not run C<ipa-client>."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:361
-#: ../customize/customize_cmdline.ml:361
+#: customize/customize_cmdline.ml:361
+#: common/mlcustomize/customize_cmdline.ml:361
 msgid "Remove all the subscriptions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:47
+#: sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:81
+#: sysprep/sysprep_operation_backup_files.ml:81
 msgid "Remove editor backup files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:36
+#: sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:38
+#: sysprep/sysprep_operation_rpm_db.ml:38
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:39
+#: sysprep/sysprep_operation_rpm_db.ml:39
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:147
+#: sysprep/sysprep_operation_logfiles.ml:147
 msgid "Remove many log files from the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_package_manager_cache.ml:46
+#: sysprep/sysprep_operation_package_manager_cache.ml:46
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:50
+#: sysprep/sysprep_operation_tmp_files.ml:50
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
+#: sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ipa_client.ml:56
+#: sysprep/sysprep_operation_ipa_client.ml:56
 msgid "Remove the IPA files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
+#: sysprep/sysprep_operation_kerberos_hostkeytab.ml:34
 msgid "Remove the Kerberos host keytab file in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:44
+#: sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rh_subscription_manager.ml:38
+#: sysprep/sysprep_operation_rh_subscription_manager.ml:38
 msgid "Remove the RH subscription manager files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
+#: sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
+#: sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:38
+#: sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:38
+#: sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:39
+#: sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:37
+#: sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:39
+#: sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
+#: sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:45
+#: sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
+#: sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:44
+#: sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:37
+#: sysprep/sysprep_operation_machine_id.ml:37
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:56
+#: sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:104
+#: sysprep/sysprep_operation_user_account.ml:104
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:35
+#: sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:34
+#: sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
+#: sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
+#: sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest’s existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1670,61 +1667,61 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:55
+#: sysprep/sysprep_operation_cron_spool.ml:55
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
-#: ../customize/customize_run.ml:333
+#: customize/customize_run.ml:333
 msgid "Removing all the subscriptions"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:51
+#: dib/output_format_docker.ml:51
 msgid "Repo and tag for docker"
 msgstr ""
 
-#: ../resize/resize.ml:1443
+#: resize/resize.ml:1443
 msgid ""
 "Resize operation completed with no errors.  Before deleting the old disk, "
 "carefully check that the resized disk boots and works correctly.\n"
 msgstr ""
 
-#: ../resize/resize.ml:209
+#: resize/resize.ml:209
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:643
+#: builder/builder.ml:643
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:669
+#: builder/builder.ml:669
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:110
+#: sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:241
-#: ../customize/customize_cmdline.ml:241
+#: customize/customize_cmdline.ml:241
+#: common/mlcustomize/customize_cmdline.ml:241
 msgid "Run command at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:332
-#: ../customize/customize_cmdline.ml:332
+#: customize/customize_cmdline.ml:332
+#: common/mlcustomize/customize_cmdline.ml:332
 msgid "Run command in disk image"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:235
-#: ../customize/customize_cmdline.ml:235
+#: customize/customize_cmdline.ml:235
+#: common/mlcustomize/customize_cmdline.ml:235
 msgid "Run script at first guest boot"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:326
-#: ../customize/customize_cmdline.ml:326
+#: customize/customize_cmdline.ml:326
+#: common/mlcustomize/customize_cmdline.ml:326
 msgid "Run script in disk image"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:150
+#: sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script’s\n"
@@ -1734,270 +1731,268 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:403
-#: ../customize/customize_cmdline.ml:403
+#: customize/customize_cmdline.ml:403
+#: common/mlcustomize/customize_cmdline.ml:403
 msgid "Run touch on a file"
 msgstr ""
 
-#: ../customize/customize_run.ml:363
+#: customize/customize_run.ml:363
 msgid "Running touch: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:299 ../customize/customize_run.ml:220
+#: customize/customize_run.ml:299 customize/customize_run.ml:220
 msgid "Running: %s"
 msgstr ""
 
-#: ../dib/dib.ml:474 ../dib/dib.ml:423
+#: dib/dib.ml:474 dib/dib.ml:423
 msgid "Running: %s/%s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:325
-#. ../common/mlcustomize/customize_cmdline.ml:234
-#: ../customize/customize_cmdline.ml:325 ../customize/customize_cmdline.ml:234
+#. common/mlcustomize/customize_cmdline.ml:325
+#. common/mlcustomize/customize_cmdline.ml:234
+#: customize/customize_cmdline.ml:325 customize/customize_cmdline.ml:234
 msgid "SCRIPT"
 msgstr ""
 
-#. ../customize/customize_cmdline.ml:315
-#. ../common/mltools/tools_utils.ml:356
-#. ../common/mlcustomize/customize_cmdline.ml:470
-#. ../common/mlcustomize/customize_cmdline.ml:344
-#. ../common/mlcustomize/customize_cmdline.ml:315
-#: ../customize/customize_cmdline.ml:470 ../customize/customize_cmdline.ml:344
+#. customize/customize_cmdline.ml:315
+#. common/mltools/tools_utils.ml:356
+#. common/mlcustomize/customize_cmdline.ml:470
+#. common/mlcustomize/customize_cmdline.ml:344
+#. common/mlcustomize/customize_cmdline.ml:315
+#: customize/customize_cmdline.ml:470 customize/customize_cmdline.ml:344
 msgid "SELECTOR"
 msgstr ""
 
-#: ../customize/customize_run.ml:419
+#: customize/customize_run.ml:419
 msgid "SELinux relabelling"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:292
-#. ../common/mlcustomize/customize_cmdline.ml:196
-#: ../customize/customize_cmdline.ml:292 ../customize/customize_cmdline.ml:196
+#. common/mlcustomize/customize_cmdline.ml:292
+#. common/mlcustomize/customize_cmdline.ml:196
+#: customize/customize_cmdline.ml:292 customize/customize_cmdline.ml:196
 msgid "SOURCE:DEST"
 msgstr ""
 
-#: ../customize/customize_run.ml:347
+#: customize/customize_run.ml:347
 msgid "SSH key could be injected for this type of guest"
 msgstr ""
 
-#: ../customize/customize_run.ml:344
+#: customize/customize_run.ml:344
 msgid "SSH key inject: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:338
-#: ../customize/customize_cmdline.ml:338
+#: customize/customize_cmdline.ml:338
+#: common/mlcustomize/customize_cmdline.ml:338
 msgid "Scrub a file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:448
-#: ../customize/customize_cmdline.ml:448
+#: customize/customize_cmdline.ml:448
+#: common/mlcustomize/customize_cmdline.ml:448
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:430
+#: customize/customize_run.ml:430
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../customize/customize_run.ml:304
+#: customize/customize_run.ml:304
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:52 ../builder/cmdline.ml:151
+#: builder/repository_main.ml:52 builder/cmdline.ml:151
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:173
+#: dib/cmdline.ml:173
 msgid "Set Python interpreter"
 msgstr ""
 
-#: ../customize/customize_main.ml:78 ../builder/cmdline.ml:132
+#: customize/customize_main.ml:78 builder/cmdline.ml:132
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:141
+#: builder/cmdline.ml:141
 msgid "Set curl binary/command"
 msgstr ""
 
-#: ../dib/cmdline.ml:193
+#: dib/cmdline.ml:193
 msgid "Set debug level"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:57
+#: get-kernel/get_kernel.ml:57
 msgid "Set disk sector size"
 msgstr ""
 
-#: ../sysprep/main.ml:130 ../customize/customize_main.ml:82
+#: sysprep/main.ml:130 customize/customize_main.ml:82
 msgid "Set format (default: auto)"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "Set libvirt URI"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "Set libvirt guest name"
 msgstr ""
 
-#. ../builder/cmdline.ml:156
-#: ../dib/cmdline.ml:186 ../customize/customize_main.ml:83
+#: dib/cmdline.ml:186 customize/customize_main.ml:83 builder/cmdline.ml:156
 msgid "Set memory size"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#. ../builder/cmdline.ml:164
-#: ../dib/cmdline.ml:189 ../customize/customize_main.ml:86
+#: dib/cmdline.ml:189 customize/customize_main.ml:86 builder/cmdline.ml:164
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../dib/cmdline.ml:180 ../builder/cmdline.ml:163
+#: dib/cmdline.ml:180 builder/cmdline.ml:163
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:160
+#: builder/cmdline.ml:160
 msgid "Set output filename"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:458
-#: ../customize/customize_cmdline.ml:458
+#: customize/customize_cmdline.ml:458
+#: common/mlcustomize/customize_cmdline.ml:458
 msgid "Set password crypto"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:320
-#: ../customize/customize_cmdline.ml:320
+#: customize/customize_cmdline.ml:320
+#: common/mlcustomize/customize_cmdline.ml:320
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:165
+#: builder/cmdline.ml:165
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:133
+#: builder/cmdline.ml:133
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "Set temporary block device, directory or prebuilt file"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:397
-#: ../customize/customize_cmdline.ml:397
+#: customize/customize_cmdline.ml:397
+#: common/mlcustomize/customize_cmdline.ml:397
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:155
+#: builder/cmdline.ml:155
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:258
-#: ../customize/customize_cmdline.ml:258
+#: customize/customize_cmdline.ml:258
+#: common/mlcustomize/customize_cmdline.ml:258
 msgid "Set the hostname"
 msgstr ""
 
-#: ../builder/cmdline.ml:129
+#: builder/cmdline.ml:129
 msgid "Set the output architecture"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:309
-#: ../customize/customize_cmdline.ml:309
+#: customize/customize_cmdline.ml:309
+#: common/mlcustomize/customize_cmdline.ml:309
 msgid "Set user password"
 msgstr ""
 
-#: ../customize/customize_run.ml:166
+#: customize/customize_run.ml:166
 msgid "Setting a random seed"
 msgstr ""
 
-#: ../customize/customize_run.ml:410
+#: customize/customize_run.ml:410
 msgid "Setting passwords"
 msgstr ""
 
-#: ../customize/password.ml:110
+#: customize/password.ml:110
 msgid "Setting random password of %s to %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:268
+#: customize/customize_run.ml:268
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:181
+#: customize/customize_run.ml:181
 msgid "Setting the machine ID in %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:358
+#: customize/customize_run.ml:358
 msgid "Setting the timezone: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1017
+#: resize/resize.ml:1017
 msgid "Setting up initial partition table on %s"
 msgstr ""
 
-#: ../dib/dib.ml:858
+#: dib/dib.ml:858
 msgid "Setting up the destination root"
 msgstr ""
 
-#: ../builder/cmdline.ml:153
+#: builder/cmdline.ml:153
 msgid "Shortcut for --list-format long"
 msgstr ""
 
-#: ../resize/resize.ml:211
+#: resize/resize.ml:211
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/repository_main.ml:545
+#: builder/repository_main.ml:545
 msgid "Signing index with the GPG key %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:164
+#: dib/cmdline.ml:164
 msgid "Skip the inclusion of the ‘base’ element"
 msgstr ""
 
-#: ../sparsify/copying.ml:252
+#: sparsify/copying.ml:252
 msgid "Skipping %s, as it is a read-only btrfs snapshot."
 msgstr ""
 
-#: ../sparsify/copying.ml:254
+#: sparsify/copying.ml:254
 msgid "Skipping %s, as it is a read-only device."
 msgstr ""
 
-#: ../builder/list_entries.ml:60
+#: builder/list_entries.ml:60
 msgid "Source URI: %s\n"
 msgstr ""
 
-#: ../sparsify/in_place.ml:177
+#: sparsify/in_place.ml:177
 msgid "Sparsify in-place operation completed with no errors"
 msgstr ""
 
-#: ../sparsify/copying.ml:338
+#: sparsify/copying.ml:338
 msgid "Sparsify operation completed with no errors."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:356
+#: common/mltools/tools_utils.ml:356
 msgid "Specify a LUKS key"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:275
-#: ../customize/customize_cmdline.ml:275
+#: customize/customize_cmdline.ml:275
+#: common/mlcustomize/customize_cmdline.ml:275
 msgid "TARGET:LINK[:LINK..]"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:396
-#: ../customize/customize_cmdline.ml:396
+#: customize/customize_cmdline.ml:396
+#: common/mlcustomize/customize_cmdline.ml:396
 msgid "TIMEZONE"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -2023,7 +2018,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
+#: sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -2037,7 +2032,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_backup_files.ml:83
+#: sysprep/sysprep_operation_backup_files.ml:83
 msgid ""
 "The following files are removed from anywhere in the guest\n"
 "filesystem:\n"
@@ -2050,7 +2045,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:52
+#: sysprep/sysprep_operation_fs_uuids.ml:52
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -2061,14 +2056,14 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../builder/index_parser.ml:30
+#: builder/index_parser.ml:30
 msgid ""
 "The index file downloaded from ‘%s’ is corrupt.\n"
 "You need to ask the supplier of this file to fix it and upload a fixed "
 "version."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: sysprep/sysprep_operation_machine_id.ml:38
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -2076,7 +2071,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:137
+#: sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -2088,13 +2083,13 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:57
+#: sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:129
+#: sysprep/sysprep_operation_user_account.ml:129
 msgid ""
 "The user accounts to be kept in the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2108,7 +2103,7 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:114
+#: sysprep/sysprep_operation_user_account.ml:114
 msgid ""
 "The user accounts to be removed from the guest.\n"
 "The value of this option is a list of user names separated by comma,\n"
@@ -2122,27 +2117,27 @@ msgid ""
 "This option can be specified multiple times."
 msgstr ""
 
-#: ../builder/builder.ml:280
+#: builder/builder.ml:280
 msgid "There are no notes for %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:837
+#: resize/resize.ml:837
 msgid ""
 "There is a deficit of %Ld bytes (%s).  You need to make the target disk "
 "larger by at least this amount or adjust your resizing requests."
 msgstr ""
 
-#: ../dib/elements.ml:205
+#: dib/elements.ml:205
 msgid ""
 "There is a duplicated script in your elements:\n"
 "%s/%s in: %s"
 msgstr ""
 
-#: ../resize/resize.ml:977
+#: resize/resize.ml:977
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sparsify/copying.ml:105
+#: sparsify/copying.ml:105
 msgid ""
 "There may not be enough free space on %s.\n"
 "You may need to set TMPDIR to point to a directory with more free space.\n"
@@ -2158,14 +2153,14 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine’s disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:45
+#: sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -2174,208 +2169,208 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:51
+#: sysprep/sysprep_operation_tmp_files.ml:51
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:756
+#: builder/builder.ml:756
 msgid "Total usable space"
 msgstr ""
 
-#: ../sparsify/in_place.ml:97
+#: sparsify/in_place.ml:97
 msgid "Trimming %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:385
-#: ../customize/customize_cmdline.ml:385
+#: customize/customize_cmdline.ml:385
+#: common/mlcustomize/customize_cmdline.ml:385
 msgid "Truncate a file to zero size"
 msgstr ""
 
-#: ../customize/customize_run.ml:350
+#: customize/customize_run.ml:350
 msgid "Truncating: %s"
 msgstr ""
 
-#: ../resize/resize.ml:212
+#: resize/resize.ml:212
 msgid "Turn off sparse copying"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:303
-#: ../customize/customize_cmdline.ml:303
+#: customize/customize_cmdline.ml:303
+#: common/mlcustomize/customize_cmdline.ml:303
 msgid "USER:SELECTOR"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:373
-#: ../customize/customize_cmdline.ml:373
+#: customize/customize_cmdline.ml:373
+#: common/mlcustomize/customize_cmdline.ml:373
 msgid "USER[:SELECTOR]"
 msgstr ""
 
-#: ../resize/resize.ml:1381
+#: resize/resize.ml:1381
 msgid "UUID in swap partition %s changed from ‘%s’ to ‘%s’"
 msgstr ""
 
-#: ../dib/dib.ml:961
+#: dib/dib.ml:961
 msgid "Umounting the disks"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: builder/builder.ml:631
 msgid "Uncompressing"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:414
-#: ../customize/customize_cmdline.ml:414
+#: customize/customize_cmdline.ml:414
+#: common/mlcustomize/customize_cmdline.ml:414
 msgid "Uninstall package(s)"
 msgstr ""
 
-#: ../customize/customize_run.ml:367
+#: customize/customize_run.ml:367
 msgid "Uninstalling packages: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:367
-#: ../customize/customize_cmdline.ml:367
+#: customize/customize_cmdline.ml:367
+#: common/mlcustomize/customize_cmdline.ml:367
 msgid "Unregister using subscription-manager"
 msgstr ""
 
-#: ../customize/customize_run.ml:338
+#: customize/customize_run.ml:338
 msgid "Unregistering with subscription-manager"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:420
-#: ../customize/customize_cmdline.ml:420
+#: customize/customize_cmdline.ml:420
+#: common/mlcustomize/customize_cmdline.ml:420
 msgid "Update packages"
 msgstr ""
 
-#: ../customize/customize_run.ml:372
+#: customize/customize_run.ml:372
 msgid "Updating packages"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:431
-#: ../customize/customize_cmdline.ml:431
+#: customize/customize_cmdline.ml:431
+#: common/mlcustomize/customize_cmdline.ml:431
 msgid "Upload local file to destination"
 msgstr ""
 
-#: ../customize/customize_run.ml:377
+#: customize/customize_run.ml:377
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:338
+#: common/mltools/tools_utils.ml:338
 msgid "Use ANSI colour sequences even if not tty"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:62
+#: get-kernel/get_kernel.ml:62
 msgid "Use unversioned names for files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "Users to keep"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:112
 msgid "Users to remove"
 msgstr ""
 
-#: ../sparsify/copying.ml:147
+#: sparsify/copying.ml:147
 msgid "Using prebuilt file %s as overlay"
 msgstr ""
 
-#: ../dib/output_format_vhd.ml:38
+#: dib/output_format_vhd.ml:38
 msgid ""
 "VHD output not produced, most probably vhd-util is old or not patched for "
 "‘convert’"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:442
-#: ../customize/customize_cmdline.ml:442
+#: customize/customize_cmdline.ml:442
+#: common/mlcustomize/customize_cmdline.ml:442
 msgid "Write file"
 msgstr ""
 
-#: ../customize/customize_run.ml:402
+#: customize/customize_run.ml:402
 msgid "Writing: %s"
 msgstr ""
 
-#: ../resize/resize.ml:808
+#: resize/resize.ml:808
 msgid ""
 "You cannot use --expand when there is no surplus space to expand into.  You "
 "need to make the target disk larger by at least %s."
 msgstr ""
 
-#: ../resize/resize.ml:820
+#: resize/resize.ml:820
 msgid ""
 "You cannot use --shrink when there is no deficit (see ‘deficit’ in the virt-"
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:35
+#: sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76
+#: sparsify/cmdline.ml:76
 msgid "Zero filesystem"
 msgstr ""
 
-#: ../sparsify/in_place.ml:86 ../sparsify/copying.ml:242
+#: sparsify/in_place.ml:86 sparsify/copying.ml:242
 msgid "Zeroing %s"
 msgstr ""
 
-#: ../resize/resize.ml:255
+#: resize/resize.ml:255
 msgid "alignment cannot be < 1"
 msgstr ""
 
-#: ../customize/append_line.ml:44
+#: customize/append_line.ml:44
 msgid "append_line: %s is not a file"
 msgstr ""
 
-#: ../dib/cmdline.ml:252
+#: dib/cmdline.ml:252
 msgid "at least one distribution root element must be specified"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:75
+#: sparsify/cmdline.ml:75
 msgid "block|dir|prebuilt:file"
 msgstr ""
 
-#: ../resize/resize.ml:145
+#: resize/resize.ml:145
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:175
+#: builder/builder.ml:175
 msgid "cache %s: %s"
 msgstr ""
 
-#: ../builder/cache.ml:54
+#: builder/cache.ml:54
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/cache.ml:60
+#: builder/cache.ml:60
 msgid "cached"
 msgstr ""
 
-#: ../sparsify/copying.ml:64
+#: sparsify/copying.ml:64
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../builder/builder.ml:100
+#: builder/builder.ml:100
 msgid ""
 "cannot find os-version ‘%s’ with architecture ‘%s’.\n"
 "Use --list to list available guest types."
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:235
+#: common/mlcustomize/firstboot.ml:235
 msgid ""
 "cannot finish firstboot installation by running ‘%s’ because host cpu (%s) "
 "and guest arch (%s) are not compatible.  The firstboot service may not run "
 "at boot."
 msgstr ""
 
-#: ../builder/builder.ml:369
+#: builder/builder.ml:369
 msgid "cannot output to a character device or /dev/null"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:39
+#: sysprep/sysprep_operation_fs_uuids.ml:39
 msgid "cannot set random UUID on filesystem %s type %s: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:159
+#: customize/customize_run.ml:159
 msgid ""
 "cannot use ‘%s’ because no package manager has been detected for this guest "
 "OS.\n"
@@ -2388,364 +2383,364 @@ msgid ""
 "the manual)."
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:494
-#: ../customize/customize_cmdline.ml:494
+#: customize/customize_cmdline.ml:494
+#: common/mlcustomize/customize_cmdline.ml:494
 msgid "command '%s' cannot be used in command files, see the man page"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:511
-#: ../customize/customize_cmdline.ml:511
+#: customize/customize_cmdline.ml:511
+#: common/mlcustomize/customize_cmdline.ml:511
 msgid "command '%s' not valid, see the man page"
 msgstr ""
 
-#: ../builder/sigchecker.ml:123
+#: builder/sigchecker.ml:123
 msgid ""
 "could not export public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/builder.ml:142
+#: builder/builder.ml:142
 msgid "could not find cache directory. Is $HOME set?"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:232
+#: common/mlcustomize/firstboot.ml:232
 msgid ""
 "could not finish firstboot installation by running ‘%s’ because the command "
 "failed: %s"
 msgstr ""
 
-#: ../builder/sigchecker.ml:46
+#: builder/sigchecker.ml:46
 msgid ""
 "could not import public key\n"
 "Use the ‘-v’ option and look for earlier error messages."
 msgstr ""
 
-#: ../builder/downloader.ml:92
+#: builder/downloader.ml:92
 msgid "cp (download) command failed copying ‘%s’"
 msgstr ""
 
-#: ../builder/builder.ml:161
+#: builder/builder.ml:161
 msgid "curl is not installed (or does not work)"
 msgstr ""
 
-#: ../common/mltools/registry.ml:95
+#: common/mltools/registry.ml:95
 msgid ""
 "decode_utf16le: Windows UTF16-LE string contains non-7-bit characters.  This "
 "is a bug in %s, please report it."
 msgstr ""
 
-#: ../common/mltools/registry.ml:89
+#: common/mltools/registry.ml:89
 msgid ""
 "decode_utf16le: Windows string does not appear to be in UTF16-LE encoding.  "
 "This could be a bug in %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:135
+#: sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:61
+#: get-kernel/get_kernel.ml:61
 msgid "directory"
 msgstr ""
 
-#: ../builder/builder.ml:176
+#: builder/builder.ml:176
 msgid "disabling the cache"
 msgstr ""
 
-#: ../dib/output_format.ml:102
+#: dib/output_format.ml:102
 msgid "disallowed character (%c) in format name"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:148
+#: sysprep/sysprep_operation.ml:148
 msgid "disallowed character (%c) in operation name"
 msgstr ""
 
-#: ../sparsify/in_place.ml:62
+#: sparsify/in_place.ml:62
 msgid "discard/trim is not supported"
 msgstr ""
 
-#: ../dib/output_format_docker.ml:32
+#: dib/output_format_docker.ml:32
 msgid "docker: a target was not specified, use ‘--docker-target’"
 msgstr ""
 
-#. ../customize/customize_main.ml:80
-#: ../sysprep/main.ml:125 ../get-kernel/get_kernel.ml:59
+#: sysprep/main.ml:125 get-kernel/get_kernel.ml:59
+#: customize/customize_main.ml:80
 msgid "domain"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:188
+#: get-kernel/get_kernel.ml:188
 msgid "dual/multi-boot images are not supported by this tool"
 msgstr ""
 
-#: ../dib/output_format.ml:90
+#: dib/output_format.ml:90
 msgid "duplicate format name (%s)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:136
+#: sysprep/sysprep_operation.ml:136
 msgid "duplicate operation name (%s)"
 msgstr ""
 
-#: ../dib/elements.ml:125
+#: dib/elements.ml:125
 msgid "element %s not found"
 msgstr ""
 
-#: ../resize/resize.ml:172
+#: resize/resize.ml:172
 msgid "empty --expand option"
 msgstr ""
 
-#: ../resize/resize.ml:187
+#: resize/resize.ml:187
 msgid "empty --shrink option"
 msgstr ""
 
-#. ../builder/downloader.ml:72
-#: ../get-kernel/get_kernel.ml:44 ../customize/customize_main.ml:63
+#. builder/downloader.ml:72
+#: get-kernel/get_kernel.ml:44 customize/customize_main.ml:63
 msgid "error parsing URI '%s'. Look for error messages printed above."
 msgstr ""
 
-#: ../sysprep/main.ml:60 ../resize/resize.ml:327 ../resize/resize.ml:320
+#: sysprep/main.ml:60 resize/resize.ml:327 resize/resize.ml:320
 msgid "error parsing URI ‘%s’. Look for error messages printed above."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:200
+#: common/mltools/tools_utils.ml:200
 msgid "exception: %s"
 msgstr ""
 
-#: ../common/mltools/xpath_helpers.ml:36
+#: common/mltools/xpath_helpers.ml:36
 msgid ""
 "expecting XML expression to return an integer (expression: %s, matching "
 "string: %s)"
 msgstr ""
 
-#: ../sparsify/copying.ml:335
+#: sparsify/copying.ml:335
 msgid "external command failed: %s"
 msgstr ""
 
-#: ../dib/dib.ml:998 ../common/mltools/tools_utils.ml:382
+#: dib/dib.ml:998 common/mltools/tools_utils.ml:382
 msgid "external command ‘%s’ exited with error %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:463 ../common/mltools/tools_utils.ml:384
+#: common/mltools/tools_utils.ml:463 common/mltools/tools_utils.ml:384
 msgid "external command ‘%s’ killed by signal %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:465 ../common/mltools/tools_utils.ml:386
+#: common/mltools/tools_utils.ml:465 common/mltools/tools_utils.ml:386
 msgid "external command ‘%s’ stopped by signal %d"
 msgstr ""
 
-#: ../builder/downloader.ml:126
+#: builder/downloader.ml:126
 msgid "failed to download %s: HTTP status code %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:550
+#: builder/repository_main.ml:550
 msgid "failed to export the GPG key %s"
 msgstr ""
 
-#: ../builder/repository_main.ml:556
+#: builder/repository_main.ml:556
 msgid "failed to sign index"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:191
+#: common/mltools/tools_utils.ml:191
 msgid "failure: %s"
 msgstr ""
 
-#. ../customize/customize_main.ml:75
-#: ../sysprep/main.ml:123 ../get-kernel/get_kernel.ml:56
+#: sysprep/main.ml:123 get-kernel/get_kernel.ml:56
+#: customize/customize_main.ml:75
 msgid "file"
 msgstr ""
 
-#: ../builder/sigchecker.ml:220
+#: builder/sigchecker.ml:220
 msgid ""
 "fingerprint of signature does not match the expected fingerprint!\n"
 "  found fingerprint: %s\n"
 "  expected fingerprint: %s"
 msgstr ""
 
-#: ../resize/resize.ml:1290
+#: resize/resize.ml:1290
 msgid "first partition is NTFS but does not contain NTFS boot loader magic"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:144
+#: common/mlcustomize/firstboot.ml:144
 msgid ""
 "firstboot: unknown version for old firstboot.service file %s (md5=%s), it "
 "will not be removed"
 msgstr ""
 
-#: ../dib/elements.ml:159
+#: dib/elements.ml:159
 msgid ""
 "following elements are already provided by another element:\n"
 "%s"
 msgstr ""
 
-#. ../resize/resize.ml:208
-#. ../resize/resize.ml:203
-#. ../get-kernel/get_kernel.ml:60
-#. ../dib/cmdline.ml:184
-#. ../customize/customize_main.ml:82
-#: ../sysprep/main.ml:130 ../sparsify/cmdline.ml:71 ../sparsify/cmdline.ml:70
+#. resize/resize.ml:208
+#. resize/resize.ml:203
+#. get-kernel/get_kernel.ml:60
+#. dib/cmdline.ml:184
+#. customize/customize_main.ml:82
+#: sysprep/main.ml:130 sparsify/cmdline.ml:71 sparsify/cmdline.ml:70
 msgid "format"
 msgstr ""
 
-#: ../dib/output_format.ml:97
+#: dib/output_format.ml:97
 msgid "format name is an empty string"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:76 ../sparsify/cmdline.ml:72
+#: sparsify/cmdline.ml:76 sparsify/cmdline.ml:72
 msgid "fs"
 msgstr ""
 
-#: ../sparsify/in_place.ml:103
+#: sparsify/in_place.ml:103
 msgid ""
 "fstrim operation is not supported on %s (%s).  Suppress this warning using "
 "'--ignore %s', or use copying mode instead."
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:210
+#: common/mltools/tools_utils.ml:210
 msgid "generated by %s %s"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:164
+#: common/mlcustomize/firstboot.ml:164
 msgid "guest type %s is not supported"
 msgstr ""
 
-#: ../common/mlcustomize/firstboot.ml:367
+#: common/mlcustomize/firstboot.ml:367
 msgid "guest type %s/%s is not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:154
+#: sysprep/sysprep_operation.ml:154
 msgid "heading for %s must not end with newline or period"
 msgstr ""
 
-#: ../customize/customize_run.ml:53
+#: customize/customize_run.ml:53
 msgid ""
 "host cpu (%s) and guest arch (%s) are not compatible, so you cannot use "
 "command line options that involve running commands in the guest.  Use --"
 "firstboot scripts instead."
 msgstr ""
 
-#: ../customize/customize_run.ml:270
+#: customize/customize_run.ml:270
 msgid "hostname could not be set for this type of guest"
 msgstr ""
 
-#: ../resize/resize.ml:213
+#: resize/resize.ml:213
 msgid "ignore|warn|error"
 msgstr ""
 
-#: ../builder/builder.ml:394
+#: builder/builder.ml:394
 msgid ""
 "images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s"
 msgstr ""
 
-#: ../builder/builder.ml:354
+#: builder/builder.ml:354
 msgid "input file (%s) has an unsupported type"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:198
+#: common/mltools/tools_utils.ml:198
 msgid "internal error: Not_found exception was thrown"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:195
+#: common/mltools/tools_utils.ml:195
 msgid "internal error: assertion failed at %s, line %d, char %d"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:193
+#: common/mltools/tools_utils.ml:193
 msgid "internal error: invalid argument: %s"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:154
-#. ../common/mlcustomize/customize_cmdline.ml:143
-#: ../customize/customize_cmdline.ml:154 ../customize/customize_cmdline.ml:143
+#. common/mlcustomize/customize_cmdline.ml:154
+#. common/mlcustomize/customize_cmdline.ml:143
+#: customize/customize_cmdline.ml:154 customize/customize_cmdline.ml:143
 msgid "invalid format for '--%s' parameter, see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:308
+#: common/mltools/tools_utils.ml:308
 msgid "invalid format string for --machine-readable: %s"
 msgstr ""
 
-#: ../dib/cmdline.ml:116
+#: dib/cmdline.ml:116
 msgid "invalid format ‘%s’ in --formats"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:323
+#: common/mltools/tools_utils.ml:323
 msgid "invalid output fd for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:325
+#: common/mltools/tools_utils.ml:325
 msgid "invalid output for --machine-readable: %s"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:317
+#: common/mltools/tools_utils.ml:317
 msgid "invalid output stream for --machine-readable: %s"
 msgstr ""
 
-#: ../customize/password.ml:71
+#: customize/password.ml:71
 msgid "invalid password selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:351
+#: common/mltools/tools_utils.ml:351
 msgid "invalid selector string for --key: %s"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:54
+#: customize/subscription_manager.ml:54
 msgid "invalid sm-attach selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/subscription_manager.ml:41
+#: customize/subscription_manager.ml:41
 msgid "invalid sm-credentials selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../customize/ssh_key.ml:45
+#: customize/ssh_key.ml:45
 msgid "invalid ssh-inject selector ‘%s’; see the man page"
 msgstr ""
 
-#: ../common/mltools/tools_utils.ml:189
+#: common/mltools/tools_utils.ml:189
 msgid "libguestfs error: %s"
 msgstr ""
 
-#: ../customize/customize_run.ml:47
+#: customize/customize_run.ml:47
 msgid "log file %s: %s (ignored)"
 msgstr ""
 
-#: ../resize/resize.ml:205
+#: resize/resize.ml:205
 msgid "lv"
 msgstr ""
 
-#. ../common/mlcustomize/customize_cmdline.ml:454
-#: ../customize/customize_cmdline.ml:454
+#: customize/customize_cmdline.ml:454
+#: common/mlcustomize/customize_cmdline.ml:454
 msgid "md5|sha256|sha512"
 msgstr ""
 
-#: ../builder/repository_main.ml:257
+#: builder/repository_main.ml:257
 msgid "missing image identifier"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:36
+#: common/mltools/JSON_parser.ml:36
 msgid "missing value for the key ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:147
+#: resize/resize.ml:147
 msgid "mkswap"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:31
+#: common/mltools/JSON_parser.ml:31
 msgid "more than value for the key ‘%s’"
 msgstr ""
 
-#: ../builder/repository_main.ml:114
+#: builder/repository_main.ml:114
 msgid "moving file ‘%s’ to ‘%s’ failed"
 msgstr ""
 
-#: ../customize/customize_run.ml:194
+#: customize/customize_run.ml:194
 msgid ""
 "multiple --root-password/--password options set the password for user ‘%s’ "
 "twice"
 msgstr ""
 
-#: ../resize/resize.ml:195
+#: resize/resize.ml:195
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:155
+#: builder/builder.ml:155
 msgid ""
 "no GNU Privacy Guard (GnuPG, gpg) binary was found.\n"
 "\n"
@@ -2756,84 +2751,84 @@ msgid ""
 "vulnerable to Man-In-The-Middle attacks."
 msgstr ""
 
-#: ../builder/builder.ml:250
+#: builder/builder.ml:250
 msgid "no cache directory"
 msgstr ""
 
-#: ../builder/builder.ml:243
+#: builder/builder.ml:243
 msgid "no cache directory\n"
 msgstr ""
 
-#: ../builder/builder.ml:723
+#: builder/builder.ml:723
 msgid ""
 "no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information."
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:161
+#: get-kernel/get_kernel.ml:161
 msgid "no kernel found in %s"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:186
+#: get-kernel/get_kernel.ml:186
 msgid "no operating system found"
 msgstr ""
 
-#: ../sysprep/main.ml:225 ../customize/customize_main.ml:182
+#: sysprep/main.ml:225 customize/customize_main.ml:182
 msgid "no operating systems were found in the guest image"
 msgstr ""
 
-#: ../dib/dib.ml:778
+#: dib/dib.ml:778
 msgid "no partitions found in the helper drive"
 msgstr ""
 
-#: ../builder/builder.ml:561
+#: builder/builder.ml:561
 msgid ""
 "no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used."
 msgstr ""
 
-#: ../resize/resize.ml:144
+#: resize/resize.ml:144
 msgid "ntfsresize"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:128
+#: get-kernel/get_kernel.ml:128
 msgid "operating system ‘%s’ not supported"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:160
+#: sysprep/sysprep_operation.ml:160
 msgid "operation %s has no POD"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:169
+#: sysprep/sysprep_operation.ml:169
 msgid "operation %s has no POD notes"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: sysprep/sysprep_operation.ml:152
 msgid "operation %s has no heading"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: sysprep/sysprep_operation.ml:143
 msgid "operation name is an empty string"
 msgstr ""
 
-#: ../sysprep/main.ml:137 ../sysprep/main.ml:129
+#: sysprep/main.ml:137 sysprep/main.ml:129
 msgid "operations"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:74
+#: sparsify/cmdline.ml:74
 msgid "option"
 msgstr ""
 
-#: ../sysprep/main.ml:132
+#: sysprep/main.ml:132
 msgid "opts"
 msgstr ""
 
-#: ../builder/repository_main.ml:225
+#: builder/repository_main.ml:225
 msgid "osinfo short ID: "
 msgstr ""
 
-#: ../builder/builder.ml:294
+#: builder/builder.ml:294
 msgid ""
 "output device (%s) is a partition.  If you are writing to a USB key or "
 "external drive then you probably need to write to the whole device, not to a "
@@ -2841,102 +2836,102 @@ msgid ""
 "if-partition"
 msgstr ""
 
-#: ../builder/builder.ml:397
+#: builder/builder.ml:397
 msgid ""
 "output size is too large for this block device.  Requested size = %s, output "
 "block device = %s, output block device size = %s"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:149
+#: sparsify/cmdline.ml:149
 msgid "output ‘%s’ cannot be a character device, it must be a regular file"
 msgstr ""
 
-#. ../resize/resize.ml:199
-#: ../resize/resize.ml:211 ../resize/resize.ml:204 ../resize/resize.ml:200
+#. resize/resize.ml:199
+#: resize/resize.ml:211 resize/resize.ml:204 resize/resize.ml:200
 msgid "part"
 msgstr ""
 
-#: ../resize/resize.ml:210 ../resize/resize.ml:209
+#: resize/resize.ml:210 resize/resize.ml:209
 msgid "part=size"
 msgstr ""
 
-#: ../customize/password.ml:50
+#: customize/password.ml:50
 msgid ""
 "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\" or \"sha512\""
 msgstr ""
 
-#: ../customize/password.ml:172
+#: customize/password.ml:172
 msgid ""
 "password: using insecure md5 password encryption for guest of type %s "
 "version %d.%d.\n"
 "If this is incorrect, use --password-crypto option and file a bug."
 msgstr ""
 
-#: ../customize/customize_run.ml:415
+#: customize/customize_run.ml:415
 msgid "passwords could not be set for this type of guest"
 msgstr ""
 
-#: ../dib/elements.ml:163
+#: dib/elements.ml:163
 msgid "please include an operating system element"
 msgstr ""
 
-#: ../resize/resize.ml:1077 ../resize/resize.ml:1053
+#: resize/resize.ml:1077 resize/resize.ml:1053
 msgid "pread-device: short read"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:63
+#: get-kernel/get_kernel.ml:63
 msgid "prefix"
 msgstr ""
 
-#: ../resize/resize.ml:142
+#: resize/resize.ml:142
 msgid "pvresize"
 msgstr ""
 
-#: ../sparsify/in_place.ml:128 ../sparsify/copying.ml:280
+#: sparsify/in_place.ml:128 sparsify/copying.ml:280
 msgid "pwrite: short write restoring swap partition header"
 msgstr ""
 
-#: ../sparsify/in_place.ml:181
+#: sparsify/in_place.ml:181
 msgid "quit (^C) at user request"
 msgstr ""
 
-#: ../customize/customize_run.ml:168
+#: customize/customize_run.ml:168
 msgid "random seed could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/repository_main.ml:418
+#: builder/repository_main.ml:418
 msgid "repository folder ‘%s’ doesn’t exist"
 msgstr ""
 
-#: ../resize/resize.ml:148
+#: resize/resize.ml:148
 msgid "resize.f2fs"
 msgstr ""
 
-#: ../resize/resize.ml:143
+#: resize/resize.ml:143
 msgid "resize2fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:148
+#: sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:75
+#: sysprep/sysprep_operation_script.ml:75
 msgid "script failed"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:65
+#: sysprep/sysprep_operation_script.ml:65
 msgid "script: failed (code %d)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:69
+#: sysprep/sysprep_operation_script.ml:69
 msgid "script: killed by signal (%d)"
 msgstr ""
 
-#: ../resize/resize.ml:196
+#: resize/resize.ml:196
 msgid "sectors"
 msgstr ""
 
-#: ../customize/customize_run.ml:162
+#: customize/customize_run.ml:162
 msgid ""
 "sorry, ‘%s’ with the ‘%s’ package manager has not been implemented yet.\n"
 "\n"
@@ -2944,90 +2939,90 @@ msgid ""
 "options instead (described in the manual)."
 msgstr ""
 
-#: ../builder/cmdline.ml:300
+#: builder/cmdline.ml:300
 msgid "source and fingerprint lists are not the same length"
 msgstr ""
 
-#: ../customize/ssh_key.ml:57
+#: customize/ssh_key.ml:57
 msgid "ssh-inject: $HOME environment variable is not set"
 msgstr ""
 
-#: ../customize/ssh_key.ml:93
+#: customize/ssh_key.ml:93
 msgid "ssh-inject: key is an empty string"
 msgstr ""
 
-#: ../customize/ssh_key.ml:66
+#: customize/ssh_key.ml:66
 msgid "ssh-inject: no public key file found in %s"
 msgstr ""
 
-#: ../customize/ssh_key.ml:83
+#: customize/ssh_key.ml:83
 msgid "ssh-inject: public key file (%s) is empty"
 msgstr ""
 
-#: ../customize/ssh_key.ml:112
+#: customize/ssh_key.ml:112
 msgid "ssh-inject: the user %s does not exist on the guest"
 msgstr ""
 
-#: ../dib/dib.ml:506
+#: dib/dib.ml:506
 msgid "sub-process killed by signal (%d)"
 msgstr ""
 
-#: ../customize/customize_run.ml:324
+#: customize/customize_run.ml:324
 msgid "subscription-manager credentials required for --sm-register"
 msgstr ""
 
-#: ../customize/customize_run.ml:64
+#: customize/customize_run.ml:64
 msgid ""
 "the command may have failed because the network is disabled.  Try either "
 "removing ‘--no-network’ or adding ‘--network’ on the command line."
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:76
+#: common/mltools/JSON_parser.ml:76
 msgid "the key ‘%s’ was not found in a list of objects"
 msgstr ""
 
-#: ../dib/cmdline.ml:248
+#: dib/cmdline.ml:248
 msgid "the list of output formats cannot be empty"
 msgstr ""
 
-#: ../builder/repository_main.ml:454
+#: builder/repository_main.ml:454
 msgid ""
 "the repository must contain an index file when running in automated mode"
 msgstr ""
 
-#: ../resize/resize.ml:477
+#: resize/resize.ml:477
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../dib/dib.ml:537
+#: dib/dib.ml:537
 msgid "the specified base path is not the diskimage-builder library"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:70
+#: common/mltools/JSON_parser.ml:70
 msgid "the value for key ‘%s’ is not a string as expected"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:42
+#: common/mltools/JSON_parser.ml:42
 msgid "the value for the key ‘%s’ is not a string"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:62
+#: common/mltools/JSON_parser.ml:62
 msgid "the value for the key ‘%s’ is not an integer"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:47
+#: common/mltools/JSON_parser.ml:47
 msgid "the value for the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:51
+#: common/mltools/JSON_parser.ml:51
 msgid "the value is not an object"
 msgstr ""
 
-#: ../common/mltools/JSON_parser.ml:32
+#: common/mltools/JSON_parser.ml:32
 msgid "the value of the key ‘%s’ is not an object"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: builder/sigchecker.ml:173
 msgid ""
 "there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -3035,211 +3030,211 @@ msgid ""
 "are susceptible to man-in-the-middle attacks."
 msgstr ""
 
-#: ../customize/customize_run.ml:360
+#: customize/customize_run.ml:360
 msgid "timezone could not be set for this type of guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:250
+#: builder/cmdline.ml:250
 msgid "too many parameters, at most one ‘os-version’ is allowed for --list"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: builder/cmdline.ml:241
 msgid "too many parameters, expecting ‘os-version’"
 msgstr ""
 
-#: ../builder/repository_main.ml:100
+#: builder/repository_main.ml:100
 msgid "too many parameters, only one path to repository is allowed"
 msgstr ""
 
-#: ../common/mltools/urandom.ml:37
+#: common/mltools/urandom.ml:37
 msgid "unexpected end of file while reading /dev/urandom"
 msgstr ""
 
-#: ../builder/downloader.ml:117
+#: builder/downloader.ml:117
 msgid ""
 "unexpected output from curl command, enable debug and look at previous "
 "messages"
 msgstr ""
 
-#: ../common/mltools/checksums.ml:58
+#: common/mltools/checksums.ml:58
 msgid "unhandled checksum type ‘%s’"
 msgstr ""
 
-#: ../resize/resize.ml:264
+#: resize/resize.ml:264
 msgid "unknown --align-first option: use never|always|auto"
 msgstr ""
 
-#: ../resize/resize.ml:272
+#: resize/resize.ml:272
 msgid "unknown --unknown-filesystems: use ignore|warn|error"
 msgstr ""
 
-#. ../resize/resize.ml:878
-#: ../resize/resize.ml:966 ../resize/resize.ml:935 ../resize/resize.ml:896
+#. resize/resize.ml:878
+#: resize/resize.ml:966 resize/resize.ml:935 resize/resize.ml:896
 msgid "unknown/unavailable method for expanding the %s filesystem on %s"
 msgstr ""
 
-#: ../sysprep/utils.ml:64
+#: sysprep/utils.ml:64
 msgid "updating the system CA store on this guest %s/%s is not supported"
 msgstr ""
 
-#. ../customize/customize_main.ml:79
-#: ../sysprep/main.ml:124 ../get-kernel/get_kernel.ml:58
+#: sysprep/main.ml:124 get-kernel/get_kernel.ml:58
+#: customize/customize_main.ml:79
 msgid "uri"
 msgstr ""
 
-#: ../resize/resize.ml:308
+#: resize/resize.ml:308
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:134
+#: sparsify/cmdline.ml:134
 msgid "usage: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:145
+#: sysprep/sysprep_operation_user_account.ml:145
 msgid ""
 "user-accounts: --keep-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:147
+#: sysprep/sysprep_operation_user_account.ml:147
 msgid ""
 "user-accounts: --remove-user-accounts parameter was used, but the \"user-"
 "account\" operation is not enabled"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:38
+#: sysprep/sysprep_operation_user_account.ml:38
 msgid "user-accounts: empty user name"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_user_account.ml:112
-#: ../sysprep/sysprep_operation_user_account.ml:127
+#. sysprep/sysprep_operation_user_account.ml:112
+#: sysprep/sysprep_operation_user_account.ml:127
 msgid "users"
 msgstr ""
 
-#: ../dib/utils.ml:55
+#: dib/utils.ml:55
 msgid ""
 "variable ‘%s’ has more than one occurrency in lines:\n"
 "%s"
 msgstr ""
 
-#: ../dib/utils.ml:51
+#: dib/utils.ml:51
 msgid ""
 "variable ‘%s’ not found in lines:\n"
 "%s"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: builder/cmdline.ml:272
 msgid ""
 "virt-builder --get-kernel image\n"
 "Missing ‘image’ (disk image file) argument"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: builder/cmdline.ml:256
 msgid ""
 "virt-builder --notes os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: builder/cmdline.ml:239
 msgid ""
 "virt-builder os-version\n"
 "Missing ‘os-version’. Use ‘--list’ to list available template names."
 msgstr ""
 
-#: ../builder/repository_main.ml:240
+#: builder/repository_main.ml:240
 msgid ""
 "virt-builder template images must have one and only one root file system, "
 "found %d"
 msgstr ""
 
-#: ../builder/repository_main.ml:96
+#: builder/repository_main.ml:96
 msgid ""
 "virt-builder-repository /path/to/repo\n"
 "\n"
 "Use ‘/path/to/repo’ to point to the repository folder."
 msgstr ""
 
-#: ../builder/builder.ml:166
+#: builder/builder.ml:166
 msgid "virt-resize is not installed (or does not work)"
 msgstr ""
 
-#: ../resize/resize.ml:146
+#: resize/resize.ml:146
 msgid "xfs_growfs"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:95
+#: get-kernel/get_kernel.ml:95
 msgid ""
 "you cannot give -a and -d options together.  Read virt-get-kernel(1) man "
 "page for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:176
+#: sysprep/main.ml:176
 msgid ""
 "you cannot give -a and -d options together.  Read virt-sysprep(1) man page "
 "for further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:132
+#: customize/customize_main.ml:132
 msgid ""
 "you cannot give -a and -d options together. Read virt-customize(1) man page "
 "for further information."
 msgstr ""
 
-#: ../sysprep/main.ml:78
+#: sysprep/main.ml:78
 msgid "you cannot pass an empty argument to --enable"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:162
+#: sparsify/cmdline.ml:162
 msgid "you cannot use --in-place and --check-tmpdir options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:165
+#: sparsify/cmdline.ml:165
 msgid "you cannot use --in-place and --compress options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:168
+#: sparsify/cmdline.ml:168
 msgid "you cannot use --in-place and --convert options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:174
+#: sparsify/cmdline.ml:174
 msgid "you cannot use --in-place and --tmp options together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:171
+#: sparsify/cmdline.ml:171
 msgid "you cannot use --in-place and -o options together"
 msgstr ""
 
-#: ../resize/resize.ml:797
+#: resize/resize.ml:797
 msgid "you cannot use options --expand and --shrink together"
 msgstr ""
 
-#: ../sparsify/cmdline.ml:140 ../resize/resize.ml:314
+#: sparsify/cmdline.ml:140 resize/resize.ml:314
 msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
-#: ../get-kernel/get_kernel.ml:93
+#: get-kernel/get_kernel.ml:93
 msgid ""
 "you must give either -a or -d options.  Read virt-get-kernel(1) man page for "
 "further information."
 msgstr ""
 
-#: ../sysprep/main.ml:165
+#: sysprep/main.ml:165
 msgid ""
 "you must give either -a or -d options.  Read virt-sysprep(1) man page for "
 "further information."
 msgstr ""
 
-#: ../customize/customize_main.ml:121
+#: customize/customize_main.ml:121
 msgid ""
 "you must give either -a or -d options. Read virt-customize(1) man page for "
 "further information."
 msgstr ""
 
-#: ../builder/repository_main.ml:228
+#: builder/repository_main.ml:228
 msgid "‘%s’ is not a recognized osinfo OS id; using it anyway"
 msgstr ""
 
-#: ../builder/repository_main.ml:157
+#: builder/repository_main.ml:157
 msgid "‘xz’ command failed"
 msgstr ""
 
@@ -7203,7 +7198,7 @@ msgstr ""
 msgid "unable to parse XML from stdin"
 msgstr ""
 
-#: inspector/inspector.c:715 lib/launch-libvirt.c:786 lib/launch-libvirt.c:876
+#: inspector/inspector.c:715 lib/launch-libvirt.c:785 lib/launch-libvirt.c:875
 #: lib/libvirt-domain.c:423 lib/libvirt-domain.c:507 lib/libvirt-domain.c:834
 #, c-format
 msgid "unable to create new XPath context"
@@ -7808,7 +7803,7 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr ""
 
-#: lib/launch-direct.c:918 lib/launch-libvirt.c:714
+#: lib/launch-direct.c:918 lib/launch-libvirt.c:713
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -7831,29 +7826,29 @@ msgid ""
 "‘--format’ option, or via the optional ‘format’ argument to ‘add-drive’."
 msgstr ""
 
-#: lib/launch-libvirt.c:345
+#: lib/launch-libvirt.c:344
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:359
+#: lib/launch-libvirt.c:358
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the ‘libvirt’ backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:393
+#: lib/launch-libvirt.c:392
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: lib/launch-libvirt.c:422
+#: lib/launch-libvirt.c:421
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:443
+#: lib/launch-libvirt.c:442
 msgid "could not get libvirt domain capabilities"
 msgstr ""
 
-#: lib/launch-libvirt.c:643
+#: lib/launch-libvirt.c:642
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7863,16 +7858,16 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:780
+#: lib/launch-libvirt.c:779
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:796 lib/launch-libvirt.c:884 lib/launch-libvirt.c:900
+#: lib/launch-libvirt.c:795 lib/launch-libvirt.c:883 lib/launch-libvirt.c:899
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: lib/launch-libvirt.c:831
+#: lib/launch-libvirt.c:830
 #, c-format
 msgid ""
 "libvirt hypervisor doesn’t support qemu or KVM,\n"
@@ -7887,60 +7882,60 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: lib/launch-libvirt.c:870
+#: lib/launch-libvirt.c:869
 msgid "unable to parse domain capabilities XML returned by libvirt"
 msgstr ""
 
-#: lib/launch-libvirt.c:1432
+#: lib/launch-libvirt.c:1431
 msgid "‘iface’ parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: lib/launch-libvirt.c:1478 lib/launch-libvirt.c:1736 lib/qemu.c:816
+#: lib/launch-libvirt.c:1477 lib/launch-libvirt.c:1735 lib/qemu.c:816
 #, c-format
 msgid "realpath: could not convert ‘%s’ to absolute path"
 msgstr ""
 
-#: lib/launch-libvirt.c:1561
+#: lib/launch-libvirt.c:1560
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: lib/launch-libvirt.c:1947
+#: lib/launch-libvirt.c:1946
 msgid "could not define libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:1958
+#: lib/launch-libvirt.c:1957
 msgid "rbd protocol secret must be base64 encoded"
 msgstr ""
 
-#: lib/launch-libvirt.c:1962
+#: lib/launch-libvirt.c:1961
 #, c-format
 msgid "base64_decode_alloc: %m"
 msgstr ""
 
-#: lib/launch-libvirt.c:1983
+#: lib/launch-libvirt.c:1982
 msgid "could not set libvirt secret value"
 msgstr ""
 
-#: lib/launch-libvirt.c:1996
+#: lib/launch-libvirt.c:1995
 msgid "could not get UUID from libvirt secret"
 msgstr ""
 
-#: lib/launch-libvirt.c:2169
+#: lib/launch-libvirt.c:2168
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2190 lib/launch-libvirt.c:2223
+#: lib/launch-libvirt.c:2189 lib/launch-libvirt.c:2222
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: lib/launch-libvirt.c:2289
+#: lib/launch-libvirt.c:2288
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: lib/launch-libvirt.c:2320
+#: lib/launch-libvirt.c:2319
 msgid "could not detach disk from libvirt domain"
 msgstr ""