From ae89f3e09404fd3e27a63edf93ce00a6dce73248 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Sep 2024 09:15:43 +0100 Subject: [PATCH] Rebase to upstream development version 2.5.9 Fix display of incorrect Windows 11 version resolves: RHEL-56784 Add customization options for post-conversion modification resolves: RHEL-55761 convert: windows: Ignore sriov drivers on virtio-win disk resolves: RHEL-56383 --- ...splay-osinfo-in-Converting-.-message.patch | 39 + ...e-that-mac-len-field-is-now-optional.patch | 28 - ...using-Weblate-English-United-Kingdom.patch | 103 + ...ust-qemu-ga-installation-change-path.patch | 207 - 0003-Update-translation-files.patch | 30447 ++++++++++++++++ ...ze-Inject-qemu-ga-blnsvr-into-firstb.patch | 116 - 0004-Translated-using-Weblate-Ukrainian.patch | 161 + ...about-removal-of-VMware-Tools-on-Win.patch | 45 - 0005-Translated-using-Weblate-Ukrainian.patch | 427 + 0005-Update-common-submodule.patch | 25 - ...-make-Windows-firstboot-more-reliabl.patch | 78 - 0006-Translated-using-Weblate-Ukrainian.patch | 110 + 0007-Translated-using-Weblate-Ukrainian.patch | 181 + ...-position-on-removal-of-VMware-Tools.patch | 30 - ...correct-qemu-binary-for-o-qemu-mode-.patch | 2 +- ...-the-qemu-boot-oo-qemu-boot-option-R.patch | 14 +- ...-supported-sound-cards-to-match-RHEL.patch | 2 +- ...RHEL-Fixes-for-libguestfs-winsupport.patch | 10 +- ...sk-force-VNC-as-display-RHBZ-1372671.patch | 2 +- ...-mention-SUSE-Xen-hosts-RHBZ-1430203.patch | 2 +- ...-for-supported-v2v-hypervisors-guest.patch | 2 +- 0015-RHEL-Disable-o-glance.patch | 18 +- 0016-RHEL-Remove-the-in-place-option.patch | 18 +- ...ssed-Remove-nbdcopy-version-check-an.patch | 4 +- 0018-RHEL-9-tests-Remove-btrfs-test.patch | 4 +- 0019-RHEL-9-Remove-block-driver-option.patch | 28 +- ...-about-virt-v2v-in-place-not-being-s.patch | 6 +- ...Online-all-virtio-disks-at-first-boo.patch | 93 - copy-patches.sh | 2 +- sources | 4 +- virt-v2v.spec | 28 +- 31 files changed, 31543 insertions(+), 693 deletions(-) create mode 100644 0001-convert-Display-osinfo-in-Converting-.-message.patch delete mode 100644 0001-docs-Note-that-mac-len-field-is-now-optional.patch create mode 100644 0002-Translated-using-Weblate-English-United-Kingdom.patch delete mode 100644 0002-convert-More-robust-qemu-ga-installation-change-path.patch create mode 100644 0003-Update-translation-files.patch delete mode 100644 0003-common-mlcustomize-Inject-qemu-ga-blnsvr-into-firstb.patch create mode 100644 0004-Translated-using-Weblate-Ukrainian.patch delete mode 100644 0004-docs-Add-a-note-about-removal-of-VMware-Tools-on-Win.patch create mode 100644 0005-Translated-using-Weblate-Ukrainian.patch delete mode 100644 0005-Update-common-submodule.patch delete mode 100644 0006-Pull-in-a-fix-to-make-Windows-firstboot-more-reliabl.patch create mode 100644 0006-Translated-using-Weblate-Ukrainian.patch create mode 100644 0007-Translated-using-Weblate-Ukrainian.patch delete mode 100644 0007-docs-Restate-position-on-removal-of-VMware-Tools.patch delete mode 100644 0021-convert-windows-Online-all-virtio-disks-at-first-boo.patch diff --git a/0001-convert-Display-osinfo-in-Converting-.-message.patch b/0001-convert-Display-osinfo-in-Converting-.-message.patch new file mode 100644 index 0000000..5f64842 --- /dev/null +++ b/0001-convert-Display-osinfo-in-Converting-.-message.patch @@ -0,0 +1,39 @@ +From 4b39b7bd0f7f8cc3069df7e32f2dc35140a2b6d3 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sat, 31 Aug 2024 09:25:50 +0100 +Subject: [PATCH] convert: Display osinfo in "Converting ..." message + +eg: + +[ 9.3] Converting Windows Server 2022 Phony Edition (win2k22) to run on KVM + +Reported-by: Ming Xie +Fixes: https://issues.redhat.com/browse/RHEL-56784 +Signed-off-by: Richard W.M. Jones +--- + convert/convert.ml | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/convert/convert.ml b/convert/convert.ml +index 5d955599..64b36c97 100644 +--- a/convert/convert.ml ++++ b/convert/convert.ml +@@ -220,11 +220,15 @@ and do_fstrim g inspect = + (* Conversion. *) + and do_convert g source inspect i_firmware + block_driver keep_serial_console interfaces = +- (match inspect.i_product_name with +- | "unknown" -> ++ (match inspect.i_product_name, inspect.i_osinfo with ++ | "unknown", "unknown" -> + message (f_"Converting the guest to run on KVM") +- | prod -> ++ | "unknown", osinfo -> ++ message (f_"Converting %s guest to run on KVM") osinfo ++ | prod, "unknown" -> + message (f_"Converting %s to run on KVM") prod ++ | prod, osinfo -> ++ message (f_"Converting %s (%s) to run on KVM") prod osinfo + ); + + let convert, conversion_name = diff --git a/0001-docs-Note-that-mac-len-field-is-now-optional.patch b/0001-docs-Note-that-mac-len-field-is-now-optional.patch deleted file mode 100644 index 4c74f1d..0000000 --- a/0001-docs-Note-that-mac-len-field-is-now-optional.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7800049c5612e6ffb30be7f8862d147d82976ae8 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 31 Jul 2024 10:09:50 +0100 -Subject: [PATCH] docs: Note that --mac len field is now optional - -Reported-by: Ming Xie -Updates: commit 159fda411d2f75b087106e7293d273ae142c9fbe ---- - docs/virt-v2v.pod | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index b53face6..dfe92d77 100644 ---- a/docs/virt-v2v.pod -+++ b/docs/virt-v2v.pod -@@ -394,9 +394,9 @@ Force a particular interface (controlled by its MAC address) to have a - static IP address after boot. - - The fields in the parameter are: C is the IP address. C --is the optional gateway IP address. C is the subnet mask length --(an integer). The final parameters are zero or more nameserver IP --addresses. -+is the optional gateway IP address. C is the optional subnet -+mask length (an integer). The final parameters are zero or more -+nameserver IP addresses. - - This option can be supplied zero or more times. - diff --git a/0002-Translated-using-Weblate-English-United-Kingdom.patch b/0002-Translated-using-Weblate-English-United-Kingdom.patch new file mode 100644 index 0000000..9c7bc78 --- /dev/null +++ b/0002-Translated-using-Weblate-English-United-Kingdom.patch @@ -0,0 +1,103 @@ +From 00692c57b0adde6fb3a202ae307bdf55b6f6e5cf Mon Sep 17 00:00:00 2001 +From: Andi Chandler +Date: Mon, 2 Sep 2024 15:38:35 +0200 +Subject: [PATCH] Translated using Weblate (English (United Kingdom)) + +Currently translated at 4.9% (65 of 1305 strings) + +Translation: libguestfs/virt-v2v-docs-master +Translate-URL: https://translate.fedoraproject.org/projects/libguestfs/virt-v2v-docs-master/en_GB/ +--- + po-docs/en_GB.po | 36 +++++++++++++++++++++++++++++------- + 1 file changed, 29 insertions(+), 7 deletions(-) + +diff --git a/po-docs/en_GB.po b/po-docs/en_GB.po +index 0aed20e0..0b181a34 100644 +--- a/po-docs/en_GB.po ++++ b/po-docs/en_GB.po +@@ -8,16 +8,16 @@ msgstr "" + "Project-Id-Version: libguestfs 1.39.12\n" + "Report-Msgid-Bugs-To: guestfs@lists.libguestfs.org\n" + "POT-Creation-Date: 2020-08-13 13:17+0200\n" +-"PO-Revision-Date: 2015-02-21 10:15+0000\n" +-"Last-Translator: Copied by Zanata \n" +-"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/" +-"libguestfs/language/en_GB/)\n" ++"PO-Revision-Date: 2024-09-02 13:38+0000\n" ++"Last-Translator: Andi Chandler \n" ++"Language-Team: English (United Kingdom) \n" + "Language: en_GB\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"Plural-Forms: nplurals=2; plural=(n != 1);\n" +-"X-Generator: Zanata 4.6.2\n" ++"Plural-Forms: nplurals=2; plural=n != 1;\n" ++"X-Generator: Weblate 5.7.1\n" + + #. type: =end + #: common/mlcustomize/customize-options.pod:1 +@@ -38,6 +38,12 @@ msgid "" + " ANY CHANGES YOU MAKE TO THIS FILE WILL BE LOST.\n" + "\n" + msgstr "" ++"libguestfs generated file\n" ++" WARNING: THIS FILE IS GENERATED FROM THE FOLLOWING FILES:\n" ++" generator/customize.ml\n" ++" and from the code in the generator/ subdirectory.\n" ++" ANY CHANGES YOU MAKE TO THIS FILE WILL BE LOST.\n" ++"\n" + + #. type: verbatim + #: common/mlcustomize/customize-options.pod:9 +@@ -46,6 +52,8 @@ msgid "" + " Copyright (C) 2009-2020 Red Hat Inc.\n" + "\n" + msgstr "" ++" Copyright (C) 2009-2020 Red Hat Inc.\n" ++"\n" + + #. type: verbatim + #: common/mlcustomize/customize-options.pod:11 +@@ -57,6 +65,11 @@ msgid "" + " (at your option) any later version.\n" + "\n" + msgstr "" ++" This program is free software; you can redistribute it and/or modify\n" ++" it under the terms of the GNU General Public Licence as published by\n" ++" the Free Software Foundation; either version 2 of the Licence, or\n" ++" (at your option) any later version.\n" ++"\n" + + #. type: verbatim + #: common/mlcustomize/customize-options.pod:16 +@@ -68,6 +81,11 @@ msgid "" + " GNU General Public License for more details.\n" + "\n" + msgstr "" ++" This program is distributed in the hope that it will be useful,\n" ++" but WITHOUT ANY WARRANTY; without even the implied warranty of\n" ++" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" ++" GNU General Public Licence for more details.\n" ++"\n" + + #. type: verbatim + #: common/mlcustomize/customize-options.pod:21 +@@ -78,11 +96,15 @@ msgid "" + " 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n" + "\n" + msgstr "" ++" You should have received a copy of the GNU General Public Licence along\n" ++" with this program; if not, write to the Free Software Foundation, Inc.,\n" ++" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n" ++"\n" + + #. type: =item + #: common/mlcustomize/customize-options.pod:29 + msgid "B<--append-line> FILE:LINE" +-msgstr "" ++msgstr "B<--append-line> FILE:LINE" + + #. type: textblock + #: common/mlcustomize/customize-options.pod:31 diff --git a/0002-convert-More-robust-qemu-ga-installation-change-path.patch b/0002-convert-More-robust-qemu-ga-installation-change-path.patch deleted file mode 100644 index 1bf5676..0000000 --- a/0002-convert-More-robust-qemu-ga-installation-change-path.patch +++ /dev/null @@ -1,207 +0,0 @@ -From c57ec4fd5d4942d2320aec4a6b01977dabb87f83 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 1 Aug 2024 09:01:47 +0100 -Subject: [PATCH] convert: More robust qemu-ga installation, change paths - -Add a commit from the common submodule to attempt to make qemu-ga -installation more robust on Windows. - -Rename network configuration Powershell script from "v2vnetcf" to -"network-configuration". I also dropped the ".ps1" extension as the -modified Firstboot.add_firstboot_powershell function now adds this. - -Update the common submodule to get these changes: - -Richard W.M. Jones (3): - mlcustomize: Use Start-Process -Wait to run qemu-ga installer - mlcustomize: Add Firstboot.firstboot_dir function - mlcustomize: Place powershell scripts into \Temp ---- - common | 2 +- - convert/convert_windows.ml | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -Submodule common ae639ba3..d489469f: -diff --git a/common/mlcustomize/firstboot.ml b/common/mlcustomize/firstboot.ml -index 4b9b910b..3bbba714 100644 ---- a/common/mlcustomize/firstboot.ml -+++ b/common/mlcustomize/firstboot.ml -@@ -239,7 +239,22 @@ WantedBy=%s - end - - module Windows = struct -- let rec install_service (g : Guestfs.guestfs) root = -+ (* Create and return the firstboot directory. *) -+ let create_firstboot_dir (g : Guestfs.guestfs) = -+ let rec loop firstboot_dir firstboot_dir_win = function -+ | [] -> firstboot_dir, firstboot_dir_win -+ | dir :: path -> -+ let firstboot_dir = -+ if firstboot_dir = "" then "/" ^ dir else firstboot_dir // dir in -+ let firstboot_dir_win = firstboot_dir_win ^ "\\" ^ dir in -+ let firstboot_dir = g#case_sensitive_path firstboot_dir in -+ g#mkdir_p firstboot_dir; -+ loop firstboot_dir firstboot_dir_win path -+ in -+ loop "" "C:" ["Program Files"; "Guestfs"; "Firstboot"] -+ -+ let rec install_service (g : Guestfs.guestfs) root -+ firstboot_dir firstboot_dir_win = - (* Either rhsrvany.exe or pvvxsvc.exe must exist. - * - * (Check also that it's not a dangling symlink but a real file). -@@ -254,20 +269,7 @@ module Windows = struct - error (f_"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)") - (virt_tools_data_dir ()) in - -- (* Create a directory for firstboot files in the guest. *) -- let firstboot_dir, firstboot_dir_win = -- let rec loop firstboot_dir firstboot_dir_win = function -- | [] -> firstboot_dir, firstboot_dir_win -- | dir :: path -> -- let firstboot_dir = -- if firstboot_dir = "" then "/" ^ dir else firstboot_dir // dir in -- let firstboot_dir_win = firstboot_dir_win ^ "\\" ^ dir in -- let firstboot_dir = g#case_sensitive_path firstboot_dir in -- g#mkdir_p firstboot_dir; -- loop firstboot_dir firstboot_dir_win path -- in -- loop "" "C:" ["Program Files"; "Guestfs"; "Firstboot"] in -- -+ (* Create a directory for firstboot scripts in the guest. *) - g#mkdir_p (firstboot_dir // "scripts"); - - (* Copy pvvxsvc or rhsrvany to the guest. *) -@@ -339,11 +341,25 @@ echo uninstalling firstboot service - "PWD", REG_SZ firstboot_dir_win ]; - ] in - reg_import reg regedits -- ); -- -- firstboot_dir -+ ) - end - -+let firstboot_dir (g : Guestfs.guestfs) root = -+ let typ = g#inspect_get_type root in -+ -+ match typ with -+ | "linux" -> -+ let dir = Linux.firstboot_dir in -+ g#mkdir_p dir; -+ dir, None -+ -+ | "windows" -> -+ let dir, dir_win = Windows.create_firstboot_dir g in -+ dir, Some dir_win -+ -+ | _ -> -+ error (f_"guest type %s is not supported") typ -+ - let script_count = ref 0 - - let add_firstboot_script (g : Guestfs.guestfs) root ?(prio = 5000) name -@@ -363,7 +379,8 @@ let add_firstboot_script (g : Guestfs.guestfs) root ?(prio = 5000) name - g#chmod 0o755 filename - - | "windows", _ -> -- let firstboot_dir = Windows.install_service g root in -+ let firstboot_dir, firstboot_dir_win = Windows.create_firstboot_dir g in -+ Windows.install_service g root firstboot_dir firstboot_dir_win; - let filename = firstboot_dir // "scripts" // filename ^ ".bat" in - g#write filename (String.unix2dos content) - -@@ -382,15 +399,18 @@ let add_firstboot_powershell g root ?prio name code = - *) - assert (g#inspect_get_type root = "windows"); - -- let windows_systemroot = g#inspect_get_windows_systemroot root in -- -- (* Create the temporary directory to put the Powershell file. *) -- let tempdir = sprintf "%s/Temp" windows_systemroot in -+ (* Place the Powershell script into firstboot_dir/Temp *) -+ let firstboot_dir, firstboot_dir_win = Windows.create_firstboot_dir g in -+ let tempdir = sprintf "%s/Temp" firstboot_dir in - g#mkdir_p tempdir; -- let ps_path = sprintf "%s/%s" tempdir name in -+ -+ let ps_path = sprintf "%s/%s.ps1" tempdir name in -+ let ps_path_win = sprintf "%s\\Temp\\%s.ps1" firstboot_dir_win name in - let code = String.concat "\r\n" code ^ "\r\n" in - g#write ps_path code; - -- let fb = sprintf "powershell.exe -ExecutionPolicy ByPass -NoProfile -file %s" -- ps_path in -+ (* Create a regular firstboot bat that just invokes powershell *) -+ let fb = -+ sprintf "powershell.exe -ExecutionPolicy ByPass -NoProfile -file \"%s\"" -+ ps_path_win in - add_firstboot_script g root ?prio name fb -diff --git a/common/mlcustomize/firstboot.mli b/common/mlcustomize/firstboot.mli -index 8231af65..34ff0690 100644 ---- a/common/mlcustomize/firstboot.mli -+++ b/common/mlcustomize/firstboot.mli -@@ -16,6 +16,23 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - *) - -+val firstboot_dir : Guestfs.guestfs -> string -> string * string option -+(** [firstboot_dir g root] -+ returns the path of the firstboot directory, creating it in -+ the guest if necessary. -+ -+ This returns the name of the directory as a guestfs path, and -+ optionally the name as a Windows path (only for Windows guests). -+ -+ For Linux this could be [/usr/lib/virt-sysprep, None] -+ -+ For Windows this could be ["/Program Files/Guestfs/Firstboot", -+ Some "C:\Program Files\Guestfs\Firstboot"] -+ -+ Additional files that are used during firstboot can be placed -+ in this directory, but be careful not to conflict with files -+ and scripts added by the firstboot process itself. *) -+ - val add_firstboot_script : Guestfs.guestfs -> string -> ?prio:int -> string -> - string -> unit - (** [add_firstboot_script g root prio name content] adds a firstboot -diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml -index eee93669..b04a3b38 100644 ---- a/common/mlcustomize/inject_virtio_win.ml -+++ b/common/mlcustomize/inject_virtio_win.ml -@@ -592,11 +592,11 @@ and configure_qemu_ga t files = - add "# Run qemu-ga installers"; - List.iter ( - fun msi_path -> -- add (sprintf "C:\\%s /norestart /qn /l+*vx C:\\%s.log" -+ add (sprintf "Start-Process -Wait -FilePath \"C:\\%s\" -ArgumentList \"/norestart\",\"/qn\",\"/l+*vx\",\"C:\\%s.log\"" - msi_path msi_path) - ) files; - -- Firstboot.add_firstboot_powershell t.g t.root "install-qemu-ga.ps1" !script -+ Firstboot.add_firstboot_powershell t.g t.root "install-qemu-ga" !script - - and configure_blnsvr t blnsvr = - let cmd = sprintf "\ -diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml -index 2d6e2059..52ca5bbe 100644 ---- a/convert/convert_windows.ml -+++ b/convert/convert_windows.ml -@@ -397,7 +397,7 @@ let convert (g : G.guestfs) _ inspect i_firmware block_driver _ static_ips = - %systemroot%\\Sysnative\\PnPutil -i -a \ - %systemroot%\\Drivers\\Virtio\\*.inf" in - -- (* Set priority higher than that of "v2vnetcf.ps1" firstboot script. *) -+ (* Set priority higher than that of "network-configure" firstboot script. *) - Firstboot.add_firstboot_script g inspect.i_root ~prio:2000 - "pnputil install drivers" fb_script; - -@@ -674,7 +674,7 @@ let convert (g : G.guestfs) _ inspect i_firmware block_driver _ static_ips = - * Powershell script which runs at boot. - *) - if static_ips <> [] then ( -- let psh_filename = "v2vnetcf.ps1" in -+ let psh_filename = "network-configure" in - let psh = ref [] in - let add = List.push_back psh in - diff --git a/0003-Update-translation-files.patch b/0003-Update-translation-files.patch new file mode 100644 index 0000000..8798b28 --- /dev/null +++ b/0003-Update-translation-files.patch @@ -0,0 +1,30447 @@ +From a8587202db8c3adeafe8a116847481ffbda1acab Mon Sep 17 00:00:00 2001 +From: Weblate +Date: Mon, 2 Sep 2024 15:38:36 +0200 +Subject: [PATCH] Update translation files + +Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. + +Translation: libguestfs/virt-v2v-master +Translate-URL: https://translate.fedoraproject.org/projects/libguestfs/virt-v2v-master/ +--- + po/cs.po | 760 +++++++++++++++++++++++++++++++++++++--------------- + po/de.po | 762 +++++++++++++++++++++++++++++++++++++--------------- + po/es.po | 736 +++++++++++++++++++++++++++++++++++--------------- + po/fi.po | 764 +++++++++++++++++++++++++++++++++++++--------------- + po/fr.po | 738 +++++++++++++++++++++++++++++++++++--------------- + po/gu.po | 736 +++++++++++++++++++++++++++++++++++--------------- + po/hi.po | 736 +++++++++++++++++++++++++++++++++++--------------- + po/ja.po | 738 +++++++++++++++++++++++++++++++++++--------------- + po/ka.po | 746 ++++++++++++++++++++++++++++++++++++--------------- + po/kn.po | 736 +++++++++++++++++++++++++++++++++++--------------- + po/ml.po | 736 +++++++++++++++++++++++++++++++++++--------------- + po/mr.po | 736 +++++++++++++++++++++++++++++++++++--------------- + po/nl.po | 736 +++++++++++++++++++++++++++++++++++--------------- + po/or.po | 736 +++++++++++++++++++++++++++++++++++--------------- + po/pa.po | 736 +++++++++++++++++++++++++++++++++++--------------- + po/pl.po | 752 ++++++++++++++++++++++++++++++++++++--------------- + po/si.po | 736 +++++++++++++++++++++++++++++++++++--------------- + po/uk.po | 801 ++++++++++++++++++++++++++++++++++++++++--------------- + 18 files changed, 9544 insertions(+), 3877 deletions(-) + +diff --git a/po/cs.po b/po/cs.po +index 415a9b9b..95b11248 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: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2023-04-08 18:20+0000\n" + "Last-Translator: Pavel Borecki \n" + "Language-Team: Czech = 1.13.5" + msgstr "" + +@@ -388,82 +435,114 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++msgid "Appending line to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++msgid "Attaching to compatible subscriptions" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++msgid "Changing permissions of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + msgid "Copy local files or directories from a tarball into image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++msgid "Copying: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "Vytvořit složku" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "Vytvořit symbolické odkazy" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "Jsou vytvářena metadata výstupu" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "Přihlašovací údaje pro subscription-manager" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "Smazat soubor či složku" + ++#: common/mlcustomize/customize_run.ml:184 ++msgid "Deleting: %s" ++msgstr "" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "Zobrazit stručnou nápovědu" +@@ -472,7 +551,7 @@ msgstr "Zobrazit stručnou nápovědu" + msgid "Display version and exit" + msgstr "Zobrazit verzi a skončit" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -484,10 +563,14 @@ msgstr "Nevypisovat zprávy o míře postupu" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "Upravit soubor pomocí výrazu v Perl" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "Zapnout ladící zprávy z libguestfs" +@@ -500,41 +583,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "Exportovat úložnou doménu" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "SOUBOR" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "Jak zvolit kořenový souborový systém" + +@@ -546,23 +629,29 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "Ignorováno kvůli zpětné kompatibilitě" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "Vpravit do hosta veřejný klíč" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++#, fuzzy ++#| msgid "Inject virtio-win drivers into a Windows guest" ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "Vpravit ovladače virtio-win do Windows hosta" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "Vpravit QEMU agenta do Windows hosta" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "Vpravit ovladače virtio-win do Windows hosta" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "Vstupní formát" + +@@ -589,20 +678,43 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "Vstupní transport" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++#, fuzzy ++#| msgid "Uninstall package(s)" ++msgid "Installing packages: %s" ++msgstr "Odinstalovat balíčky" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "Libvirt URI" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -610,26 +722,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -643,14 +763,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -718,26 +838,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -745,7 +865,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "" + +@@ -753,164 +873,209 @@ msgstr "" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++#, fuzzy ++#| msgid "Credentials for subscription-manager" ++msgid "Registering with subscription-manager" ++msgstr "Přihlašovací údaje pro subscription-manager" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++#, fuzzy ++#| msgid "%s: warning: %s" ++msgid "Running: %s" ++msgstr "%s: varování: %s%c" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "SKRIPT" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -918,35 +1083,59 @@ msgstr "" + msgid "Set program name" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++msgid "Setting passwords" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++msgid "Setting the timezone: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -954,30 +1143,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -990,7 +1179,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -998,51 +1187,83 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++#, fuzzy ++#| msgid "%s: warning: %s" ++msgid "Truncating: %s" ++msgstr "%s: varování: %s%c" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "Odinstalovat balíčky" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++#, fuzzy ++#| msgid "Uninstall package(s)" ++msgid "Uninstalling packages: %s" ++msgstr "Odinstalovat balíčky" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++#, fuzzy ++#| msgid "Credentials for subscription-manager" ++msgid "Unregistering with subscription-manager" ++msgstr "Přihlašovací údaje pro subscription-manager" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++#, fuzzy ++#| msgid "Uninstall package(s)" ++msgid "Updating packages" ++msgstr "Odinstalovat balíčky" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++msgid "Uploading: %s to %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1050,10 +1271,16 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:391 ++#, fuzzy ++#| msgid "%s: warning: %s" ++msgid "Writing: %s" ++msgstr "%s: varování: %s%c" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1079,6 +1306,10 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++msgid "append_line: %s is not a file" ++msgstr "" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1123,7 +1354,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + msgid "cannot parse --mac ip prefix length field as an integer: %s" + msgstr "" + +@@ -1156,11 +1387,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "" + +@@ -1168,13 +1399,13 @@ msgstr "" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1205,8 +1436,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1214,7 +1445,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1235,7 +1466,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1259,7 +1490,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1311,7 +1542,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1333,7 +1564,7 @@ msgstr "" + msgid "exited with error %d" + msgstr "%s ukončeno s chybovým stavem %d" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1351,11 +1582,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1363,15 +1594,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1393,7 +1624,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1408,14 +1639,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "host typu %s není podporován" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1432,7 +1674,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1455,7 +1697,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1504,13 +1746,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1522,7 +1764,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1538,10 +1780,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1570,6 +1828,10 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++msgid "log file %s: %s (ignored)" ++msgstr "" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1580,7 +1842,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "" + +@@ -1588,7 +1850,7 @@ msgstr "" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1604,7 +1866,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1632,11 +1900,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1679,7 +1947,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1691,7 +1959,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1728,7 +1996,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1744,7 +2012,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1752,11 +2020,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1783,7 +2051,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1831,22 +2099,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1864,19 +2149,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1922,13 +2212,35 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++#, fuzzy ++#| msgid "Inject a public key into the guest" ++msgid "ssh-inject: no public key file found in %s" ++msgstr "Vpravit do hosta veřejný klíč" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + #, fuzzy + #| msgid "%s stopped by signal %d (%s)" +@@ -1943,11 +2255,15 @@ msgstr "" + msgid "subprocess signalled or stopped by signal %d" + msgstr "" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1957,15 +2273,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1978,7 +2300,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2035,7 +2357,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2043,7 +2365,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2051,7 +2373,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2081,7 +2403,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2093,23 +2423,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "neznámá volba -i: %s" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "neznámá volba -o: %s" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2117,11 +2447,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2129,11 +2459,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2141,7 +2471,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2215,7 +2545,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2257,7 +2587,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/de.po b/po/de.po +index 19a55135..e5adfcf5 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: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:48+0000\n" + "Last-Translator: Copied by Zanata \n" + "Language-Team: German (http://www.transifex.com/projects/p/libguestfs/" +@@ -35,7 +35,7 @@ msgstr "" + "%s\n" + "Optionen:\n" + +-#: common/mltools/tools_utils.ml:695 ++#: common/mltools/tools_utils.ml:695 common/mlcustomize/customize_run.ml:435 + msgid "%s (ignored)" + msgstr "%s (ignoriert)" + +@@ -43,6 +43,10 @@ msgstr "%s (ignoriert)" + msgid "%s did not return any output" + msgstr "%s hat keine Ausgabe zurückgegeben" + ++#: common/mlcustomize/customize_run.ml:191 ++msgid "%s does not exist in the guest" ++msgstr "" ++ + #: output/output_rhv.ml:273 + msgid "" + "%s does not exist or is not a directory.\n" +@@ -57,11 +61,19 @@ msgid "" + "this out through the RHV-M user interface." + msgstr "" + +-#. inspector/inspector.ml:149 ++#: common/mlcustomize/customize_run.ml:121 ++msgid "%s ignored for non-Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:194 ++msgid "%s is not a regular file in the guest" ++msgstr "" ++ ++#. inspector/inspector.ml:151 + #. inspector/inspector.ml:40 +-#. in-place/in_place.ml:146 ++#. in-place/in_place.ml:148 + #. in-place/in_place.ml:39 +-#: v2v/v2v.ml:196 v2v/v2v.ml:182 v2v/v2v.ml:162 v2v/v2v.ml:44 ++#: v2v/v2v.ml:198 v2v/v2v.ml:184 v2v/v2v.ml:164 v2v/v2v.ml:44 + msgid "%s option used more than once on the command line" + msgstr "" + +@@ -79,11 +91,17 @@ msgid "" + "%!" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:401 ++#: common/mlcustomize/inject_virtio_win.ml:434 + msgid "%s: cannot open virtio-win ISO file: %s" + msgstr "" + +-#: v2v/v2v.ml:316 ++#: common/mlcustomize/customize_run.ml:72 ++#, fuzzy ++#| msgid "%s exited with error status %d" ++msgid "%s: command exited with an error" ++msgstr "%s beendet mit Fehlerstatus %d" ++ ++#: v2v/v2v.ml:326 + msgid "" + "%s: convert a guest to use KVM\n" + "\n" +@@ -106,7 +124,7 @@ msgid "" + "read the man page virt-v2v(1).\n" + msgstr "" + +-#: in-place/in_place.ml:184 ++#: in-place/in_place.ml:194 + msgid "" + "%s: convert a guest to use KVM in-place\n" + "\n" +@@ -125,7 +143,7 @@ msgstr "" + msgid "%s: error: %s" + msgstr "%s: Fehler: %s" + +-#: inspector/inspector.ml:187 ++#: inspector/inspector.ml:197 + msgid "" + "%s: estimate disk space needed before virt-v2v conversion\n" + "\n" +@@ -151,12 +169,39 @@ msgstr "" + msgid "%s: warning: %s" + msgstr "%s: Warnung: %s%c" + +-#. common/mlcustomize/customize_cmdline.ml:268 +-#: common/mlcustomize/customize_cmdline.ml:371 ++#. common/mlcustomize/customize_cmdline.ml:270 ++#: common/mlcustomize/customize_cmdline.ml:379 + msgid "'CMD+ARGS'" + msgstr "" + +-#: v2v/v2v.ml:142 inspector/inspector.ml:129 in-place/in_place.ml:123 ++#: common/mlcustomize/customize_run.ml:141 ++msgid "" ++"--append-line: line must not contain newline characters. Use the --append-" ++"line option multiple times to add several lines." ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:160 ++msgid "--chown: could not parse numeric UID:GID from %s:%s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:224 ++msgid "" ++"--inject-blnsvr: blnsvr.exe not found in virtio-win source that you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:233 ++msgid "" ++"--inject-qemu-ga: QEMU Guest Agent MSI not found in virtio-win source that " ++"you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:249 ++msgid "" ++"--inject-virtio-win: virtio drivers were not found for this Windows version " ++"in the virtio-win source that you specified" ++msgstr "" ++ ++#: v2v/v2v.ml:144 inspector/inspector.ml:131 in-place/in_place.ml:125 + msgid "--mac ip prefix length field is out of range" + msgstr "" + +@@ -204,16 +249,16 @@ msgstr "" + msgid "-i ova: expecting an OVA file name on the command line" + msgstr "" + +-#: input/OVA.ml:356 ++#: input/OVA.ml:361 + msgid "" + "-i ova: invalid OVA file: path ‘%s’ references a file outside the archive" + msgstr "" + +-#: input/input_vmx.ml:53 ++#: input/input_vmx.ml:57 + msgid "-i vmx: cannot use -it vddk in this input mode" + msgstr "" + +-#: input/input_vmx.ml:56 ++#: input/input_vmx.ml:60 + msgid "-i vmx: expecting a VMX file or ssh:// URI" + msgstr "" + +@@ -355,7 +400,7 @@ msgstr "" + msgid "-o vdsm: unknown vdsm-compat level ‘%s’" + msgstr "" + +-#: output/output.ml:100 ++#: output/output.ml:99 + msgid "-oo compressed option requires nbdcopy >= 1.13.5" + msgstr "" + +@@ -397,84 +442,124 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "Zeile(n) an die Datei anhängen" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++#, fuzzy ++#| msgid "Append line(s) to the file" ++msgid "Appending line to %s" ++msgstr "Zeile(n) an die Datei anhängen" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++msgid "Attaching to compatible subscriptions" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "Berechtigungen einer Datei ändern" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++#, fuzzy ++#| msgid "Change the permissions of a file" ++msgid "Changing permissions of %s to %s" ++msgstr "Berechtigungen einer Datei ändern" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "Ausgabedatei komprimieren (nur -of qcow2)" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "Dateien in Festplattenabbild kopieren" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + #, fuzzy + #| msgid "Copy local files or directories into image" + msgid "Copy local files or directories from a tarball into image" + msgstr "Lokale Dateien oder Verzeichnisse in das Abbild kopieren" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "Lokale Dateien oder Verzeichnisse in das Abbild kopieren" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "Festplatte %d/%d wird kopiert" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++#, fuzzy ++#| msgid "Copying disk %d/%d" ++msgid "Copying: %s to %s" ++msgstr "Festplatte %d/%d wird kopiert" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "Ein Verzeichnis erstellen" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "Symbolische Verknüpfungen erstellen" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "Ausgabe-Metadaten erstellen" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "VERZ" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "Eine Datei oder ein Verzeichnis löschen" + ++#: common/mlcustomize/customize_run.ml:184 ++#, fuzzy ++#| msgid "exception: %s" ++msgid "Deleting: %s" ++msgstr "Ausnahme: %s" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "" +@@ -483,7 +568,7 @@ msgstr "" + msgid "Display version and exit" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -495,10 +580,14 @@ msgstr "" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "" +@@ -511,41 +600,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "DATEI" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "DATEI:INHALT" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "DATEI:ZIEL" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "DATEI:ZEILE" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "DATEINAME" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "HOSTNAME" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "" + +@@ -557,23 +646,27 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + #, fuzzy + #| msgid "Set output format" + msgid "Input format" +@@ -602,20 +695,41 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++msgid "Installing packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "Libvirt-URI" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -623,26 +737,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "Dateien in Festplattenabbild verschieben" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -656,14 +778,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -731,26 +853,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "PFAD" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "BERECHTIGUNGEN:DATEI" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -758,7 +880,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "" + +@@ -766,164 +888,207 @@ msgstr "" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++msgid "Registering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++#, fuzzy ++#| msgid "%s: warning: %s" ++msgid "Running: %s" ++msgstr "%s: Warnung: %s%c" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "SKRIPT" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "QUELLE:ZIEL" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "Ausgabeformat festlegen" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "Ausgabemodus festlegen (Standard: libvirt)" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -931,37 +1096,65 @@ msgstr "" + msgid "Set program name" + msgstr "Programmname festlegen" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "Standardzeitzone festlegen" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + #, fuzzy + #| msgid "Set output format" + msgid "Set the output filename" + msgstr "Ausgabeformat festlegen" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "Benutzerpasswort festlegen" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++#, fuzzy ++#| msgid "Set user password" ++msgid "Setting passwords" ++msgstr "Benutzerpasswort festlegen" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++#, fuzzy ++#| msgid "Set the default timezone" ++msgid "Setting the timezone: %s" ++msgstr "Standardzeitzone festlegen" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -969,30 +1162,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "ZEITZONE" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -1005,7 +1198,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1013,51 +1206,79 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++#, fuzzy ++#| msgid "%s: warning: %s" ++msgid "Truncating: %s" ++msgstr "%s: Warnung: %s%c" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++msgid "Uninstalling packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++msgid "Unregistering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "Pakete aktualisieren" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++#, fuzzy ++#| msgid "Update packages" ++msgid "Updating packages" ++msgstr "Pakete aktualisieren" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++msgid "Uploading: %s to %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1065,10 +1286,16 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "Datei schreiben" + ++#: common/mlcustomize/customize_run.ml:391 ++#, fuzzy ++#| msgid "%s: warning: %s" ++msgid "Writing: %s" ++msgstr "%s: Warnung: %s%c" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1094,6 +1321,12 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++#, fuzzy ++#| msgid "Append line(s) to the file" ++msgid "append_line: %s is not a file" ++msgstr "Zeile(n) an die Datei anhängen" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1138,7 +1371,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + msgid "cannot parse --mac ip prefix length field as an integer: %s" + msgstr "" + +@@ -1171,11 +1404,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "" + +@@ -1183,13 +1416,13 @@ msgstr "" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1220,8 +1453,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1229,7 +1462,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1250,7 +1483,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1274,7 +1507,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1326,7 +1559,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1348,7 +1581,7 @@ msgstr "Ausnahme: %s" + msgid "exited with error %d" + msgstr "%s beendet mit Fehlerstatus %d" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1366,11 +1599,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1378,15 +1611,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1408,7 +1641,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1423,14 +1656,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1447,7 +1691,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1470,7 +1714,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1519,13 +1763,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1537,7 +1781,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1553,10 +1797,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1585,6 +1845,12 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++#, fuzzy ++#| msgid "%s (ignored)" ++msgid "log file %s: %s (ignored)" ++msgstr "%s (ignoriert)" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1595,7 +1861,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "md5|sha256|sha512" + +@@ -1603,7 +1869,7 @@ msgstr "md5|sha256|sha512" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1619,7 +1885,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1647,11 +1919,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1694,7 +1966,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1706,7 +1978,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1743,7 +2015,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1759,7 +2031,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1767,11 +2039,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1798,7 +2070,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1846,22 +2118,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1879,19 +2168,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1937,13 +2231,33 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++msgid "ssh-inject: no public key file found in %s" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + #, fuzzy + #| msgid "%s stopped by signal %d (%s)" +@@ -1962,11 +2276,15 @@ msgstr "%s beendet mit Fehlerstatus %d" + msgid "subprocess signalled or stopped by signal %d" + msgstr "%s gestoppt durch Signal %d (%s)" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1976,15 +2294,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1997,7 +2321,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2054,7 +2378,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2062,7 +2386,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2070,7 +2394,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2098,7 +2422,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2110,23 +2442,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2134,11 +2466,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2146,11 +2478,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2158,7 +2490,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2232,7 +2564,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2274,7 +2606,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/es.po b/po/es.po +index 065cd2b7..97fa9cf5 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: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-03-16 07:04+0000\n" + "Last-Translator: Alex Puchades \n" + "Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/" +@@ -34,7 +34,7 @@ msgid "" + "Options:\n" + msgstr "" + +-#: common/mltools/tools_utils.ml:695 ++#: common/mltools/tools_utils.ml:695 common/mlcustomize/customize_run.ml:435 + msgid "%s (ignored)" + msgstr "" + +@@ -42,6 +42,10 @@ msgstr "" + msgid "%s did not return any output" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:191 ++msgid "%s does not exist in the guest" ++msgstr "" ++ + #: output/output_rhv.ml:273 + msgid "" + "%s does not exist or is not a directory.\n" +@@ -56,11 +60,19 @@ msgid "" + "this out through the RHV-M user interface." + msgstr "" + +-#. inspector/inspector.ml:149 ++#: common/mlcustomize/customize_run.ml:121 ++msgid "%s ignored for non-Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:194 ++msgid "%s is not a regular file in the guest" ++msgstr "" ++ ++#. inspector/inspector.ml:151 + #. inspector/inspector.ml:40 +-#. in-place/in_place.ml:146 ++#. in-place/in_place.ml:148 + #. in-place/in_place.ml:39 +-#: v2v/v2v.ml:196 v2v/v2v.ml:182 v2v/v2v.ml:162 v2v/v2v.ml:44 ++#: v2v/v2v.ml:198 v2v/v2v.ml:184 v2v/v2v.ml:164 v2v/v2v.ml:44 + msgid "%s option used more than once on the command line" + msgstr "" + +@@ -78,11 +90,15 @@ msgid "" + "%!" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:401 ++#: common/mlcustomize/inject_virtio_win.ml:434 + msgid "%s: cannot open virtio-win ISO file: %s" + msgstr "" + +-#: v2v/v2v.ml:316 ++#: common/mlcustomize/customize_run.ml:72 ++msgid "%s: command exited with an error" ++msgstr "" ++ ++#: v2v/v2v.ml:326 + msgid "" + "%s: convert a guest to use KVM\n" + "\n" +@@ -105,7 +121,7 @@ msgid "" + "read the man page virt-v2v(1).\n" + msgstr "" + +-#: in-place/in_place.ml:184 ++#: in-place/in_place.ml:194 + msgid "" + "%s: convert a guest to use KVM in-place\n" + "\n" +@@ -124,7 +140,7 @@ msgstr "" + msgid "%s: error: %s" + msgstr "" + +-#: inspector/inspector.ml:187 ++#: inspector/inspector.ml:197 + msgid "" + "%s: estimate disk space needed before virt-v2v conversion\n" + "\n" +@@ -150,12 +166,39 @@ msgstr "" + msgid "%s: warning: %s" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:268 +-#: common/mlcustomize/customize_cmdline.ml:371 ++#. common/mlcustomize/customize_cmdline.ml:270 ++#: common/mlcustomize/customize_cmdline.ml:379 + msgid "'CMD+ARGS'" + msgstr "" + +-#: v2v/v2v.ml:142 inspector/inspector.ml:129 in-place/in_place.ml:123 ++#: common/mlcustomize/customize_run.ml:141 ++msgid "" ++"--append-line: line must not contain newline characters. Use the --append-" ++"line option multiple times to add several lines." ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:160 ++msgid "--chown: could not parse numeric UID:GID from %s:%s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:224 ++msgid "" ++"--inject-blnsvr: blnsvr.exe not found in virtio-win source that you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:233 ++msgid "" ++"--inject-qemu-ga: QEMU Guest Agent MSI not found in virtio-win source that " ++"you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:249 ++msgid "" ++"--inject-virtio-win: virtio drivers were not found for this Windows version " ++"in the virtio-win source that you specified" ++msgstr "" ++ ++#: v2v/v2v.ml:144 inspector/inspector.ml:131 in-place/in_place.ml:125 + msgid "--mac ip prefix length field is out of range" + msgstr "" + +@@ -203,16 +246,16 @@ msgstr "" + msgid "-i ova: expecting an OVA file name on the command line" + msgstr "" + +-#: input/OVA.ml:356 ++#: input/OVA.ml:361 + msgid "" + "-i ova: invalid OVA file: path ‘%s’ references a file outside the archive" + msgstr "" + +-#: input/input_vmx.ml:53 ++#: input/input_vmx.ml:57 + msgid "-i vmx: cannot use -it vddk in this input mode" + msgstr "" + +-#: input/input_vmx.ml:56 ++#: input/input_vmx.ml:60 + msgid "-i vmx: expecting a VMX file or ssh:// URI" + msgstr "" + +@@ -354,7 +397,7 @@ msgstr "" + msgid "-o vdsm: unknown vdsm-compat level ‘%s’" + msgstr "" + +-#: output/output.ml:100 ++#: output/output.ml:99 + msgid "-oo compressed option requires nbdcopy >= 1.13.5" + msgstr "" + +@@ -396,82 +439,114 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++msgid "Appending line to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++msgid "Attaching to compatible subscriptions" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++msgid "Changing permissions of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + msgid "Copy local files or directories from a tarball into image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++msgid "Copying: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:184 ++msgid "Deleting: %s" ++msgstr "" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "" +@@ -480,7 +555,7 @@ msgstr "" + msgid "Display version and exit" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -492,10 +567,14 @@ msgstr "" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "" +@@ -508,41 +587,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "" + +@@ -554,23 +633,27 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "" + +@@ -597,20 +680,41 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++msgid "Installing packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -618,26 +722,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -651,14 +763,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -726,26 +838,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -753,7 +865,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "" + +@@ -761,164 +873,205 @@ msgstr "" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++msgid "Registering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++msgid "Running: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -926,35 +1079,59 @@ msgstr "" + msgid "Set program name" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++msgid "Setting passwords" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++msgid "Setting the timezone: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -962,30 +1139,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -998,7 +1175,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1006,51 +1183,75 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++msgid "Truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++msgid "Uninstalling packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++msgid "Unregistering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++msgid "Updating packages" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++msgid "Uploading: %s to %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1058,10 +1259,14 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:391 ++msgid "Writing: %s" ++msgstr "" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1087,6 +1292,10 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++msgid "append_line: %s is not a file" ++msgstr "" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1131,7 +1340,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + msgid "cannot parse --mac ip prefix length field as an integer: %s" + msgstr "" + +@@ -1164,11 +1373,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "" + +@@ -1176,13 +1385,13 @@ msgstr "" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1213,8 +1422,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1222,7 +1431,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1245,7 +1454,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1269,7 +1478,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1321,7 +1530,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1341,7 +1550,7 @@ msgstr "" + msgid "exited with error %d" + msgstr "" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1359,11 +1568,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1371,15 +1580,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1401,7 +1610,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1416,14 +1625,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1440,7 +1660,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1463,7 +1683,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1512,13 +1732,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1530,7 +1750,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1546,10 +1766,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1576,6 +1812,10 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++msgid "log file %s: %s (ignored)" ++msgstr "" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1586,7 +1826,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "" + +@@ -1594,7 +1834,7 @@ msgstr "" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1610,7 +1850,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1638,11 +1884,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1685,7 +1931,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1697,7 +1943,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1734,7 +1980,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1750,7 +1996,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1758,11 +2004,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1789,7 +2035,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1837,22 +2083,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1870,19 +2133,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1928,13 +2196,33 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++msgid "ssh-inject: no public key file found in %s" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + msgid "stopped by signal %d" + msgstr "" +@@ -1947,11 +2235,15 @@ msgstr "" + msgid "subprocess signalled or stopped by signal %d" + msgstr "" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1961,15 +2253,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1982,7 +2280,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2039,7 +2337,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2047,7 +2345,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2055,7 +2353,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2083,7 +2381,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2095,23 +2401,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2119,11 +2425,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2131,11 +2437,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2143,7 +2449,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2217,7 +2523,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2259,7 +2565,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/fi.po b/po/fi.po +index 787abc74..04d6e7da 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -8,7 +8,7 @@ msgstr "" + "Project-Id-Version: virt-v2v 1.43.4\n" + "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" + "component=libguestfs&product=Virtualization+Tools\n" +-"POT-Creation-Date: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2022-12-23 18:20+0000\n" + "Last-Translator: Jan Kuparinen \n" + "Language-Team: Finnish = 1.13.5" + msgstr "" + +@@ -394,84 +439,122 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "Lisää asennettavat paketit" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "Lisää ensimmäisen käynnistyksen yhteydessä asennettavat paketit" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "Liitä tiedostoon rivit" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++#, fuzzy ++#| msgid "Append line(s) to the file" ++msgid "Appending line to %s" ++msgstr "Liitä tiedostoon rivit" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "Liitä tilaus-manager-varantoon" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++#, fuzzy ++#| msgid "Attach to a subscription-manager pool" ++msgid "Attaching to compatible subscriptions" ++msgstr "Liitä tilaus-manager-varantoon" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "Muuta tiedoston käyttöoikeuksia" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++#, fuzzy ++#| msgid "Change the permissions of a file" ++msgid "Changing permissions of %s to %s" ++msgstr "Muuta tiedoston käyttöoikeuksia" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "Yhteensopivuusvaihtoehto, ei tee mitään" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "Kopioi levykuvan tiedostot" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + #, fuzzy + #| msgid "Copy local files or directories into image" + msgid "Copy local files or directories from a tarball into image" + msgstr "Kopioi paikalliset tiedostot tai hakemistot kuvaan" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "Kopioi paikalliset tiedostot tai hakemistot kuvaan" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++msgid "Copying: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "Luo hakemisto" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "Luo symbolisia linkkejä" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "HAKEMISTO" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:184 ++msgid "Deleting: %s" ++msgstr "" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "" +@@ -480,7 +563,7 @@ msgstr "" + msgid "Display version and exit" + msgstr "Näytä versio ja poistu" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -492,10 +575,14 @@ msgstr "" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "" +@@ -508,41 +595,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "TIEDOSTO" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "" + +@@ -554,23 +641,27 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "" + +@@ -597,20 +688,43 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++#, fuzzy ++#| msgid "Uninstall package(s)" ++msgid "Installing packages: %s" ++msgstr "Poista paketteja" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "Libvirt:n URI" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -618,26 +732,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "Siirrä levykuvassa olevia tiedostoja" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -651,14 +773,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -726,26 +848,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -753,7 +875,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "Lue mukautuskomennot tiedostosta" + +@@ -761,164 +883,209 @@ msgstr "Lue mukautuskomennot tiedostosta" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++#, fuzzy ++#| msgid "Attach to a subscription-manager pool" ++msgid "Registering with subscription-manager" ++msgstr "Liitä tilaus-manager-varantoon" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "Suorita komento ensimmäisen vieraskäynnistyksen yhteydessä" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "Suorita komento levykuvassa" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++#, fuzzy ++#| msgid "%s: warning: %s" ++msgid "Running: %s" ++msgstr "%s: varoitus: %s" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "KOMENTOSARJA" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -926,35 +1093,59 @@ msgstr "" + msgid "Set program name" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++msgid "Setting passwords" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++msgid "Setting the timezone: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -962,30 +1153,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -998,7 +1189,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1006,51 +1197,83 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++#, fuzzy ++#| msgid "%s: warning: %s" ++msgid "Truncating: %s" ++msgstr "%s: varoitus: %s" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "Poista paketteja" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++#, fuzzy ++#| msgid "Uninstall package(s)" ++msgid "Uninstalling packages: %s" ++msgstr "Poista paketteja" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++#, fuzzy ++#| msgid "Attach to a subscription-manager pool" ++msgid "Unregistering with subscription-manager" ++msgstr "Liitä tilaus-manager-varantoon" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++#, fuzzy ++#| msgid "Uninstall package(s)" ++msgid "Updating packages" ++msgstr "Poista paketteja" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++msgid "Uploading: %s to %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1058,10 +1281,16 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:391 ++#, fuzzy ++#| msgid "%s: warning: %s" ++msgid "Writing: %s" ++msgstr "%s: varoitus: %s" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1087,6 +1316,12 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++#, fuzzy ++#| msgid "Append line(s) to the file" ++msgid "append_line: %s is not a file" ++msgstr "Liitä tiedostoon rivit" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1131,7 +1366,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + msgid "cannot parse --mac ip prefix length field as an integer: %s" + msgstr "" + +@@ -1164,11 +1399,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "komentoa '%s' ei voi käyttää komentotiedostoissa, katso man-sivu" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "komentoa '%s'ei kelpaa, katso man-sivua" + +@@ -1176,13 +1411,13 @@ msgstr "komentoa '%s'ei kelpaa, katso man-sivua" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1215,8 +1450,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1224,7 +1459,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1245,7 +1480,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1269,7 +1504,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1321,7 +1556,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1343,7 +1578,7 @@ msgstr "" + msgid "exited with error %d" + msgstr "ulkoinen komento '%s' poistui virheellä %d" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1361,11 +1596,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1373,15 +1608,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1403,7 +1638,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1418,14 +1653,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1442,7 +1688,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1465,7 +1711,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1514,13 +1760,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1532,7 +1778,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1548,10 +1794,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1578,6 +1840,12 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++#, fuzzy ++#| msgid "%s (ignored)" ++msgid "log file %s: %s (ignored)" ++msgstr "%s (ohitettu)" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1588,7 +1856,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "" + +@@ -1596,7 +1864,7 @@ msgstr "" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1612,7 +1880,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1640,11 +1914,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1687,7 +1961,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1699,7 +1973,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1736,7 +2010,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1752,7 +2026,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1760,11 +2034,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1791,7 +2065,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1839,22 +2113,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1872,19 +2163,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1930,13 +2226,33 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++msgid "ssh-inject: no public key file found in %s" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + #, fuzzy + #| msgid "subprocess signalled or stopped by signal %d" +@@ -1951,11 +2267,15 @@ msgstr "" + msgid "subprocess signalled or stopped by signal %d" + msgstr "aliprosessi, joka on signaloitu tai pysäytetty signaalilla %d" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1965,15 +2285,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1986,7 +2312,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2043,7 +2369,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2051,7 +2377,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2059,7 +2385,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2087,7 +2413,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2099,23 +2433,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "tuntematon --root vaihtoehto: %s" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "tuntematon -i vaihtoehto: %s" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "tuntematon -o vaihtoehto: %s" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "tuntematon -oa vaihtoehto: %s" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2123,11 +2457,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2135,11 +2469,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2147,7 +2481,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2221,7 +2555,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2263,7 +2597,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/fr.po b/po/fr.po +index 7b0864b0..b6571f37 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: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2023-03-21 09:20+0000\n" + "Last-Translator: grimst \n" + "Language-Team: French = 1.13.5" + msgstr "" + +@@ -398,82 +443,114 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++msgid "Appending line to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++msgid "Attaching to compatible subscriptions" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++msgid "Changing permissions of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + msgid "Copy local files or directories from a tarball into image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++msgid "Copying: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:184 ++msgid "Deleting: %s" ++msgstr "" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "" +@@ -482,7 +559,7 @@ msgstr "" + msgid "Display version and exit" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -494,10 +571,14 @@ msgstr "" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "" +@@ -510,41 +591,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "" + +@@ -556,23 +637,27 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "" + +@@ -599,20 +684,41 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++msgid "Installing packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -620,26 +726,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -653,14 +767,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -728,26 +842,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "CHEMIN" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -755,7 +869,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "" + +@@ -763,164 +877,205 @@ msgstr "" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++msgid "Registering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++msgid "Running: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -928,35 +1083,59 @@ msgstr "" + msgid "Set program name" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++msgid "Setting passwords" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++msgid "Setting the timezone: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -964,30 +1143,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -1000,7 +1179,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1008,51 +1187,75 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++msgid "Truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++msgid "Uninstalling packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++msgid "Unregistering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++msgid "Updating packages" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++msgid "Uploading: %s to %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1060,10 +1263,14 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:391 ++msgid "Writing: %s" ++msgstr "" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1089,6 +1296,10 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++msgid "append_line: %s is not a file" ++msgstr "" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1133,7 +1344,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + #, fuzzy + #| msgid "credential index out of range" + msgid "cannot parse --mac ip prefix length field as an integer: %s" +@@ -1168,11 +1379,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "" + +@@ -1180,13 +1391,13 @@ msgstr "" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1217,8 +1428,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1226,7 +1437,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1249,7 +1460,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1273,7 +1484,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1325,7 +1536,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1347,7 +1558,7 @@ msgstr "" + msgid "exited with error %d" + msgstr "%s s'est terminé avec l'état d'erreur %d" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1365,11 +1576,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1377,15 +1588,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1407,7 +1618,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1422,14 +1633,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1446,7 +1668,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1469,7 +1691,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1518,13 +1740,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1536,7 +1758,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1552,10 +1774,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1584,6 +1822,10 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++msgid "log file %s: %s (ignored)" ++msgstr "" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1594,7 +1836,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "" + +@@ -1602,7 +1844,7 @@ msgstr "" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1618,7 +1860,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1646,11 +1894,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1693,7 +1941,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1705,7 +1953,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1742,7 +1990,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1758,7 +2006,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1766,11 +2014,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1797,7 +2045,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1845,22 +2093,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1878,19 +2143,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1936,13 +2206,33 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++msgid "ssh-inject: no public key file found in %s" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + #, fuzzy + #| msgid "%s stopped by signal %d (%s)" +@@ -1961,11 +2251,15 @@ msgstr "%s s'est terminé avec l'état d'erreur %d" + msgid "subprocess signalled or stopped by signal %d" + msgstr "%s a été arrêté par le signal %d (%s)" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1975,15 +2269,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1996,7 +2296,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2053,7 +2353,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2061,7 +2361,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2069,7 +2369,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2097,7 +2397,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2109,23 +2417,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2133,11 +2441,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2145,11 +2453,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2157,7 +2465,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2231,7 +2539,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2273,7 +2581,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/gu.po b/po/gu.po +index 02643ec3..9d34a976 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: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:49+0000\n" + "Last-Translator: Copied by Zanata \n" + "Language-Team: Gujarati (http://www.transifex.com/projects/p/libguestfs/" +@@ -32,7 +32,7 @@ msgid "" + "Options:\n" + msgstr "" + +-#: common/mltools/tools_utils.ml:695 ++#: common/mltools/tools_utils.ml:695 common/mlcustomize/customize_run.ml:435 + msgid "%s (ignored)" + msgstr "" + +@@ -40,6 +40,10 @@ msgstr "" + msgid "%s did not return any output" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:191 ++msgid "%s does not exist in the guest" ++msgstr "" ++ + #: output/output_rhv.ml:273 + msgid "" + "%s does not exist or is not a directory.\n" +@@ -54,11 +58,19 @@ msgid "" + "this out through the RHV-M user interface." + msgstr "" + +-#. inspector/inspector.ml:149 ++#: common/mlcustomize/customize_run.ml:121 ++msgid "%s ignored for non-Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:194 ++msgid "%s is not a regular file in the guest" ++msgstr "" ++ ++#. inspector/inspector.ml:151 + #. inspector/inspector.ml:40 +-#. in-place/in_place.ml:146 ++#. in-place/in_place.ml:148 + #. in-place/in_place.ml:39 +-#: v2v/v2v.ml:196 v2v/v2v.ml:182 v2v/v2v.ml:162 v2v/v2v.ml:44 ++#: v2v/v2v.ml:198 v2v/v2v.ml:184 v2v/v2v.ml:164 v2v/v2v.ml:44 + msgid "%s option used more than once on the command line" + msgstr "" + +@@ -76,11 +88,15 @@ msgid "" + "%!" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:401 ++#: common/mlcustomize/inject_virtio_win.ml:434 + msgid "%s: cannot open virtio-win ISO file: %s" + msgstr "" + +-#: v2v/v2v.ml:316 ++#: common/mlcustomize/customize_run.ml:72 ++msgid "%s: command exited with an error" ++msgstr "" ++ ++#: v2v/v2v.ml:326 + msgid "" + "%s: convert a guest to use KVM\n" + "\n" +@@ -103,7 +119,7 @@ msgid "" + "read the man page virt-v2v(1).\n" + msgstr "" + +-#: in-place/in_place.ml:184 ++#: in-place/in_place.ml:194 + msgid "" + "%s: convert a guest to use KVM in-place\n" + "\n" +@@ -122,7 +138,7 @@ msgstr "" + msgid "%s: error: %s" + msgstr "" + +-#: inspector/inspector.ml:187 ++#: inspector/inspector.ml:197 + msgid "" + "%s: estimate disk space needed before virt-v2v conversion\n" + "\n" +@@ -148,12 +164,39 @@ msgstr "" + msgid "%s: warning: %s" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:268 +-#: common/mlcustomize/customize_cmdline.ml:371 ++#. common/mlcustomize/customize_cmdline.ml:270 ++#: common/mlcustomize/customize_cmdline.ml:379 + msgid "'CMD+ARGS'" + msgstr "" + +-#: v2v/v2v.ml:142 inspector/inspector.ml:129 in-place/in_place.ml:123 ++#: common/mlcustomize/customize_run.ml:141 ++msgid "" ++"--append-line: line must not contain newline characters. Use the --append-" ++"line option multiple times to add several lines." ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:160 ++msgid "--chown: could not parse numeric UID:GID from %s:%s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:224 ++msgid "" ++"--inject-blnsvr: blnsvr.exe not found in virtio-win source that you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:233 ++msgid "" ++"--inject-qemu-ga: QEMU Guest Agent MSI not found in virtio-win source that " ++"you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:249 ++msgid "" ++"--inject-virtio-win: virtio drivers were not found for this Windows version " ++"in the virtio-win source that you specified" ++msgstr "" ++ ++#: v2v/v2v.ml:144 inspector/inspector.ml:131 in-place/in_place.ml:125 + msgid "--mac ip prefix length field is out of range" + msgstr "" + +@@ -201,16 +244,16 @@ msgstr "" + msgid "-i ova: expecting an OVA file name on the command line" + msgstr "" + +-#: input/OVA.ml:356 ++#: input/OVA.ml:361 + msgid "" + "-i ova: invalid OVA file: path ‘%s’ references a file outside the archive" + msgstr "" + +-#: input/input_vmx.ml:53 ++#: input/input_vmx.ml:57 + msgid "-i vmx: cannot use -it vddk in this input mode" + msgstr "" + +-#: input/input_vmx.ml:56 ++#: input/input_vmx.ml:60 + msgid "-i vmx: expecting a VMX file or ssh:// URI" + msgstr "" + +@@ -352,7 +395,7 @@ msgstr "" + msgid "-o vdsm: unknown vdsm-compat level ‘%s’" + msgstr "" + +-#: output/output.ml:100 ++#: output/output.ml:99 + msgid "-oo compressed option requires nbdcopy >= 1.13.5" + msgstr "" + +@@ -394,82 +437,114 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++msgid "Appending line to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++msgid "Attaching to compatible subscriptions" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++msgid "Changing permissions of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + msgid "Copy local files or directories from a tarball into image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++msgid "Copying: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:184 ++msgid "Deleting: %s" ++msgstr "" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "" +@@ -478,7 +553,7 @@ msgstr "" + msgid "Display version and exit" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -490,10 +565,14 @@ msgstr "" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "" +@@ -506,41 +585,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "" + +@@ -552,23 +631,27 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "" + +@@ -595,20 +678,41 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++msgid "Installing packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -616,26 +720,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -649,14 +761,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -724,26 +836,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -751,7 +863,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "" + +@@ -759,164 +871,205 @@ msgstr "" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++msgid "Registering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++msgid "Running: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -924,35 +1077,59 @@ msgstr "" + msgid "Set program name" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++msgid "Setting passwords" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++msgid "Setting the timezone: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -960,30 +1137,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -996,7 +1173,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1004,51 +1181,75 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++msgid "Truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++msgid "Uninstalling packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++msgid "Unregistering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++msgid "Updating packages" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++msgid "Uploading: %s to %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1056,10 +1257,14 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:391 ++msgid "Writing: %s" ++msgstr "" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1085,6 +1290,10 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++msgid "append_line: %s is not a file" ++msgstr "" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1129,7 +1338,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + msgid "cannot parse --mac ip prefix length field as an integer: %s" + msgstr "" + +@@ -1162,11 +1371,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "" + +@@ -1174,13 +1383,13 @@ msgstr "" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1211,8 +1420,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1220,7 +1429,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1243,7 +1452,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1267,7 +1476,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1319,7 +1528,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1339,7 +1548,7 @@ msgstr "" + msgid "exited with error %d" + msgstr "" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1357,11 +1566,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1369,15 +1578,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1399,7 +1608,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1414,14 +1623,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1438,7 +1658,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1461,7 +1681,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1510,13 +1730,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1528,7 +1748,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1544,10 +1764,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1574,6 +1810,10 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++msgid "log file %s: %s (ignored)" ++msgstr "" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1584,7 +1824,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "" + +@@ -1592,7 +1832,7 @@ msgstr "" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1608,7 +1848,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1636,11 +1882,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1683,7 +1929,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1695,7 +1941,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1732,7 +1978,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1748,7 +1994,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1756,11 +2002,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1787,7 +2033,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1835,22 +2081,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1868,19 +2131,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1926,13 +2194,33 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++msgid "ssh-inject: no public key file found in %s" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + msgid "stopped by signal %d" + msgstr "" +@@ -1945,11 +2233,15 @@ msgstr "" + msgid "subprocess signalled or stopped by signal %d" + msgstr "" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1959,15 +2251,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1980,7 +2278,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2037,7 +2335,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2045,7 +2343,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2053,7 +2351,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2081,7 +2379,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2093,23 +2399,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2117,11 +2423,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2129,11 +2435,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2141,7 +2447,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2215,7 +2521,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2257,7 +2563,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/hi.po b/po/hi.po +index 11f334ce..279dd88b 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: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:49+0000\n" + "Last-Translator: Copied by Zanata \n" + "Language-Team: Hindi (http://www.transifex.com/projects/p/libguestfs/" +@@ -32,7 +32,7 @@ msgid "" + "Options:\n" + msgstr "" + +-#: common/mltools/tools_utils.ml:695 ++#: common/mltools/tools_utils.ml:695 common/mlcustomize/customize_run.ml:435 + msgid "%s (ignored)" + msgstr "" + +@@ -40,6 +40,10 @@ msgstr "" + msgid "%s did not return any output" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:191 ++msgid "%s does not exist in the guest" ++msgstr "" ++ + #: output/output_rhv.ml:273 + msgid "" + "%s does not exist or is not a directory.\n" +@@ -54,11 +58,19 @@ msgid "" + "this out through the RHV-M user interface." + msgstr "" + +-#. inspector/inspector.ml:149 ++#: common/mlcustomize/customize_run.ml:121 ++msgid "%s ignored for non-Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:194 ++msgid "%s is not a regular file in the guest" ++msgstr "" ++ ++#. inspector/inspector.ml:151 + #. inspector/inspector.ml:40 +-#. in-place/in_place.ml:146 ++#. in-place/in_place.ml:148 + #. in-place/in_place.ml:39 +-#: v2v/v2v.ml:196 v2v/v2v.ml:182 v2v/v2v.ml:162 v2v/v2v.ml:44 ++#: v2v/v2v.ml:198 v2v/v2v.ml:184 v2v/v2v.ml:164 v2v/v2v.ml:44 + msgid "%s option used more than once on the command line" + msgstr "" + +@@ -76,11 +88,15 @@ msgid "" + "%!" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:401 ++#: common/mlcustomize/inject_virtio_win.ml:434 + msgid "%s: cannot open virtio-win ISO file: %s" + msgstr "" + +-#: v2v/v2v.ml:316 ++#: common/mlcustomize/customize_run.ml:72 ++msgid "%s: command exited with an error" ++msgstr "" ++ ++#: v2v/v2v.ml:326 + msgid "" + "%s: convert a guest to use KVM\n" + "\n" +@@ -103,7 +119,7 @@ msgid "" + "read the man page virt-v2v(1).\n" + msgstr "" + +-#: in-place/in_place.ml:184 ++#: in-place/in_place.ml:194 + msgid "" + "%s: convert a guest to use KVM in-place\n" + "\n" +@@ -122,7 +138,7 @@ msgstr "" + msgid "%s: error: %s" + msgstr "" + +-#: inspector/inspector.ml:187 ++#: inspector/inspector.ml:197 + msgid "" + "%s: estimate disk space needed before virt-v2v conversion\n" + "\n" +@@ -148,12 +164,39 @@ msgstr "" + msgid "%s: warning: %s" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:268 +-#: common/mlcustomize/customize_cmdline.ml:371 ++#. common/mlcustomize/customize_cmdline.ml:270 ++#: common/mlcustomize/customize_cmdline.ml:379 + msgid "'CMD+ARGS'" + msgstr "" + +-#: v2v/v2v.ml:142 inspector/inspector.ml:129 in-place/in_place.ml:123 ++#: common/mlcustomize/customize_run.ml:141 ++msgid "" ++"--append-line: line must not contain newline characters. Use the --append-" ++"line option multiple times to add several lines." ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:160 ++msgid "--chown: could not parse numeric UID:GID from %s:%s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:224 ++msgid "" ++"--inject-blnsvr: blnsvr.exe not found in virtio-win source that you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:233 ++msgid "" ++"--inject-qemu-ga: QEMU Guest Agent MSI not found in virtio-win source that " ++"you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:249 ++msgid "" ++"--inject-virtio-win: virtio drivers were not found for this Windows version " ++"in the virtio-win source that you specified" ++msgstr "" ++ ++#: v2v/v2v.ml:144 inspector/inspector.ml:131 in-place/in_place.ml:125 + msgid "--mac ip prefix length field is out of range" + msgstr "" + +@@ -201,16 +244,16 @@ msgstr "" + msgid "-i ova: expecting an OVA file name on the command line" + msgstr "" + +-#: input/OVA.ml:356 ++#: input/OVA.ml:361 + msgid "" + "-i ova: invalid OVA file: path ‘%s’ references a file outside the archive" + msgstr "" + +-#: input/input_vmx.ml:53 ++#: input/input_vmx.ml:57 + msgid "-i vmx: cannot use -it vddk in this input mode" + msgstr "" + +-#: input/input_vmx.ml:56 ++#: input/input_vmx.ml:60 + msgid "-i vmx: expecting a VMX file or ssh:// URI" + msgstr "" + +@@ -352,7 +395,7 @@ msgstr "" + msgid "-o vdsm: unknown vdsm-compat level ‘%s’" + msgstr "" + +-#: output/output.ml:100 ++#: output/output.ml:99 + msgid "-oo compressed option requires nbdcopy >= 1.13.5" + msgstr "" + +@@ -394,82 +437,114 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++msgid "Appending line to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++msgid "Attaching to compatible subscriptions" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++msgid "Changing permissions of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + msgid "Copy local files or directories from a tarball into image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++msgid "Copying: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:184 ++msgid "Deleting: %s" ++msgstr "" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "" +@@ -478,7 +553,7 @@ msgstr "" + msgid "Display version and exit" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -490,10 +565,14 @@ msgstr "" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "" +@@ -506,41 +585,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "" + +@@ -552,23 +631,27 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "" + +@@ -595,20 +678,41 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++msgid "Installing packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -616,26 +720,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -649,14 +761,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -724,26 +836,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -751,7 +863,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "" + +@@ -759,164 +871,205 @@ msgstr "" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++msgid "Registering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++msgid "Running: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -924,35 +1077,59 @@ msgstr "" + msgid "Set program name" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++msgid "Setting passwords" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++msgid "Setting the timezone: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -960,30 +1137,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -996,7 +1173,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1004,51 +1181,75 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++msgid "Truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++msgid "Uninstalling packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++msgid "Unregistering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++msgid "Updating packages" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++msgid "Uploading: %s to %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1056,10 +1257,14 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:391 ++msgid "Writing: %s" ++msgstr "" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1085,6 +1290,10 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++msgid "append_line: %s is not a file" ++msgstr "" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1129,7 +1338,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + msgid "cannot parse --mac ip prefix length field as an integer: %s" + msgstr "" + +@@ -1162,11 +1371,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "" + +@@ -1174,13 +1383,13 @@ msgstr "" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1211,8 +1420,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1220,7 +1429,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1241,7 +1450,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1265,7 +1474,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1317,7 +1526,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1337,7 +1546,7 @@ msgstr "" + msgid "exited with error %d" + msgstr "" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1355,11 +1564,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1367,15 +1576,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1397,7 +1606,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1412,14 +1621,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1436,7 +1656,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1459,7 +1679,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1508,13 +1728,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1526,7 +1746,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1542,10 +1762,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1572,6 +1808,10 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++msgid "log file %s: %s (ignored)" ++msgstr "" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1582,7 +1822,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "" + +@@ -1590,7 +1830,7 @@ msgstr "" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1606,7 +1846,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1634,11 +1880,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1681,7 +1927,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1693,7 +1939,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1730,7 +1976,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1746,7 +1992,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1754,11 +2000,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1785,7 +2031,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1833,22 +2079,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1866,19 +2129,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1924,13 +2192,33 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++msgid "ssh-inject: no public key file found in %s" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + msgid "stopped by signal %d" + msgstr "" +@@ -1943,11 +2231,15 @@ msgstr "" + msgid "subprocess signalled or stopped by signal %d" + msgstr "" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1957,15 +2249,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1978,7 +2276,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2035,7 +2333,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2043,7 +2341,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2051,7 +2349,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2079,7 +2377,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2091,23 +2397,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2115,11 +2421,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2127,11 +2433,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2139,7 +2445,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2213,7 +2519,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2255,7 +2561,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/ja.po b/po/ja.po +index 7c806c19..6a020972 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: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2017-02-24 07:33+0000\n" + "Last-Translator: Copied by Zanata \n" + "Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/" +@@ -33,7 +33,7 @@ msgid "" + "Options:\n" + msgstr "" + +-#: common/mltools/tools_utils.ml:695 ++#: common/mltools/tools_utils.ml:695 common/mlcustomize/customize_run.ml:435 + msgid "%s (ignored)" + msgstr "" + +@@ -41,6 +41,10 @@ msgstr "" + msgid "%s did not return any output" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:191 ++msgid "%s does not exist in the guest" ++msgstr "" ++ + #: output/output_rhv.ml:273 + msgid "" + "%s does not exist or is not a directory.\n" +@@ -55,11 +59,19 @@ msgid "" + "this out through the RHV-M user interface." + msgstr "" + +-#. inspector/inspector.ml:149 ++#: common/mlcustomize/customize_run.ml:121 ++msgid "%s ignored for non-Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:194 ++msgid "%s is not a regular file in the guest" ++msgstr "" ++ ++#. inspector/inspector.ml:151 + #. inspector/inspector.ml:40 +-#. in-place/in_place.ml:146 ++#. in-place/in_place.ml:148 + #. in-place/in_place.ml:39 +-#: v2v/v2v.ml:196 v2v/v2v.ml:182 v2v/v2v.ml:162 v2v/v2v.ml:44 ++#: v2v/v2v.ml:198 v2v/v2v.ml:184 v2v/v2v.ml:164 v2v/v2v.ml:44 + msgid "%s option used more than once on the command line" + msgstr "" + +@@ -77,11 +89,17 @@ msgid "" + "%!" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:401 ++#: common/mlcustomize/inject_virtio_win.ml:434 + msgid "%s: cannot open virtio-win ISO file: %s" + msgstr "" + +-#: v2v/v2v.ml:316 ++#: common/mlcustomize/customize_run.ml:72 ++#, fuzzy ++#| msgid "%s exited with error status %d" ++msgid "%s: command exited with an error" ++msgstr "%s がエラーステータス %d で終了しました" ++ ++#: v2v/v2v.ml:326 + msgid "" + "%s: convert a guest to use KVM\n" + "\n" +@@ -104,7 +122,7 @@ msgid "" + "read the man page virt-v2v(1).\n" + msgstr "" + +-#: in-place/in_place.ml:184 ++#: in-place/in_place.ml:194 + msgid "" + "%s: convert a guest to use KVM in-place\n" + "\n" +@@ -123,7 +141,7 @@ msgstr "" + msgid "%s: error: %s" + msgstr "" + +-#: inspector/inspector.ml:187 ++#: inspector/inspector.ml:197 + msgid "" + "%s: estimate disk space needed before virt-v2v conversion\n" + "\n" +@@ -149,12 +167,39 @@ msgstr "" + msgid "%s: warning: %s" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:268 +-#: common/mlcustomize/customize_cmdline.ml:371 ++#. common/mlcustomize/customize_cmdline.ml:270 ++#: common/mlcustomize/customize_cmdline.ml:379 + msgid "'CMD+ARGS'" + msgstr "" + +-#: v2v/v2v.ml:142 inspector/inspector.ml:129 in-place/in_place.ml:123 ++#: common/mlcustomize/customize_run.ml:141 ++msgid "" ++"--append-line: line must not contain newline characters. Use the --append-" ++"line option multiple times to add several lines." ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:160 ++msgid "--chown: could not parse numeric UID:GID from %s:%s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:224 ++msgid "" ++"--inject-blnsvr: blnsvr.exe not found in virtio-win source that you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:233 ++msgid "" ++"--inject-qemu-ga: QEMU Guest Agent MSI not found in virtio-win source that " ++"you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:249 ++msgid "" ++"--inject-virtio-win: virtio drivers were not found for this Windows version " ++"in the virtio-win source that you specified" ++msgstr "" ++ ++#: v2v/v2v.ml:144 inspector/inspector.ml:131 in-place/in_place.ml:125 + #, fuzzy + #| msgid "credential index out of range" + msgid "--mac ip prefix length field is out of range" +@@ -204,16 +249,16 @@ msgstr "" + msgid "-i ova: expecting an OVA file name on the command line" + msgstr "" + +-#: input/OVA.ml:356 ++#: input/OVA.ml:361 + msgid "" + "-i ova: invalid OVA file: path ‘%s’ references a file outside the archive" + msgstr "" + +-#: input/input_vmx.ml:53 ++#: input/input_vmx.ml:57 + msgid "-i vmx: cannot use -it vddk in this input mode" + msgstr "" + +-#: input/input_vmx.ml:56 ++#: input/input_vmx.ml:60 + msgid "-i vmx: expecting a VMX file or ssh:// URI" + msgstr "" + +@@ -355,7 +400,7 @@ msgstr "" + msgid "-o vdsm: unknown vdsm-compat level ‘%s’" + msgstr "" + +-#: output/output.ml:100 ++#: output/output.ml:99 + msgid "-oo compressed option requires nbdcopy >= 1.13.5" + msgstr "" + +@@ -397,82 +442,114 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++msgid "Appending line to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++msgid "Attaching to compatible subscriptions" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++msgid "Changing permissions of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + msgid "Copy local files or directories from a tarball into image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++msgid "Copying: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:184 ++msgid "Deleting: %s" ++msgstr "" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "" +@@ -481,7 +558,7 @@ msgstr "" + msgid "Display version and exit" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -493,10 +570,14 @@ msgstr "" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "" +@@ -509,41 +590,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "" + +@@ -555,23 +636,27 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "" + +@@ -598,20 +683,41 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++msgid "Installing packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -619,26 +725,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -652,14 +766,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -727,26 +841,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -754,7 +868,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "" + +@@ -762,164 +876,205 @@ msgstr "" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++msgid "Registering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++msgid "Running: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -927,35 +1082,59 @@ msgstr "" + msgid "Set program name" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++msgid "Setting passwords" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++msgid "Setting the timezone: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -963,30 +1142,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -999,7 +1178,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1007,51 +1186,75 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++msgid "Truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++msgid "Uninstalling packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++msgid "Unregistering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++msgid "Updating packages" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++msgid "Uploading: %s to %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1059,10 +1262,14 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:391 ++msgid "Writing: %s" ++msgstr "" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1088,6 +1295,10 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++msgid "append_line: %s is not a file" ++msgstr "" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1132,7 +1343,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + #, fuzzy + #| msgid "credential index out of range" + msgid "cannot parse --mac ip prefix length field as an integer: %s" +@@ -1167,11 +1378,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "" + +@@ -1179,13 +1390,13 @@ msgstr "" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1216,8 +1427,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1225,7 +1436,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1248,7 +1459,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1272,7 +1483,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1324,7 +1535,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1346,7 +1557,7 @@ msgstr "" + msgid "exited with error %d" + msgstr "%s がエラーステータス %d で終了しました" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1364,11 +1575,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1376,15 +1587,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1406,7 +1617,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1421,14 +1632,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1445,7 +1667,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1468,7 +1690,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1517,13 +1739,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1535,7 +1757,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1551,10 +1773,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1583,6 +1821,10 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++msgid "log file %s: %s (ignored)" ++msgstr "" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1593,7 +1835,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "" + +@@ -1601,7 +1843,7 @@ msgstr "" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1617,7 +1859,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1645,11 +1893,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1692,7 +1940,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1704,7 +1952,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1741,7 +1989,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1757,7 +2005,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1765,11 +2013,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1796,7 +2044,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1844,22 +2092,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1877,19 +2142,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1935,13 +2205,33 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++msgid "ssh-inject: no public key file found in %s" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + #, fuzzy + #| msgid "%s stopped by signal %d (%s)" +@@ -1960,11 +2250,15 @@ msgstr "%s がエラーステータス %d で終了しました" + msgid "subprocess signalled or stopped by signal %d" + msgstr "%s がシグナル %d (%s) により停止しました" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1974,15 +2268,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1995,7 +2295,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2052,7 +2352,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2060,7 +2360,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2068,7 +2368,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2094,7 +2394,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2106,23 +2414,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2130,11 +2438,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2142,11 +2450,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2154,7 +2462,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2228,7 +2536,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2270,7 +2578,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/ka.po b/po/ka.po +index 42ce7c68..bae787b6 100644 +--- a/po/ka.po ++++ b/po/ka.po +@@ -8,7 +8,7 @@ msgstr "" + "Project-Id-Version: virt-v2v 2.1.1\n" + "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" + "component=libguestfs&product=Virtualization+Tools\n" +-"POT-Creation-Date: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2023-11-26 21:01+0000\n" + "Last-Translator: Temuri Doghonadze \n" + "Language-Team: Georgian = 1.13.5" + msgstr "" + +@@ -392,82 +437,114 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++msgid "Appending line to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++msgid "Attaching to compatible subscriptions" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++msgid "Changing permissions of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + msgid "Copy local files or directories from a tarball into image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++msgid "Copying: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "საქაღალდე" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:184 ++msgid "Deleting: %s" ++msgstr "" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "" +@@ -476,7 +553,7 @@ msgstr "" + msgid "Display version and exit" + msgstr "ვერსიის ჩვენება და გამოსვლა" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -488,10 +565,14 @@ msgstr "" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "" +@@ -504,41 +585,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "ფაილი" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "ფაილის სახელი" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "ჰოსტის სახელი" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "" + +@@ -550,23 +631,27 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "" + +@@ -593,20 +678,43 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++#, fuzzy ++#| msgid "Uninstall package(s)" ++msgid "Installing packages: %s" ++msgstr "პაკეტების წაშლა" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "Libvirt-ის URI" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -614,26 +722,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -647,14 +763,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -722,26 +838,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "ბილიკი" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -749,7 +865,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "" + +@@ -757,164 +873,205 @@ msgstr "" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++msgid "Registering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++msgid "Running: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "სკრიპტი" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -922,35 +1079,59 @@ msgstr "" + msgid "Set program name" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++msgid "Setting passwords" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++msgid "Setting the timezone: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -958,30 +1139,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -994,7 +1175,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1002,51 +1183,81 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++msgid "Truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "პაკეტების წაშლა" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++#, fuzzy ++#| msgid "Uninstall package(s)" ++msgid "Uninstalling packages: %s" ++msgstr "პაკეტების წაშლა" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++msgid "Unregistering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++#, fuzzy ++#| msgid "Uninstall package(s)" ++msgid "Updating packages" ++msgstr "პაკეტების წაშლა" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++#, fuzzy ++#| msgid "downloading %s" ++msgid "Uploading: %s to %s" ++msgstr "%1-ის გადმოწერა" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1054,10 +1265,14 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:391 ++msgid "Writing: %s" ++msgstr "" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1083,6 +1298,10 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++msgid "append_line: %s is not a file" ++msgstr "" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1127,7 +1346,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + msgid "cannot parse --mac ip prefix length field as an integer: %s" + msgstr "" + +@@ -1160,11 +1379,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "" + +@@ -1172,13 +1391,13 @@ msgstr "" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1209,8 +1428,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1218,7 +1437,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1239,7 +1458,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1263,7 +1482,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1315,7 +1534,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1335,7 +1554,7 @@ msgstr "" + msgid "exited with error %d" + msgstr "დასრულდა შეცდომით %d" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1353,11 +1572,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1365,15 +1584,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1395,7 +1614,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1410,14 +1629,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1434,7 +1664,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1457,7 +1687,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1506,13 +1736,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1524,7 +1754,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1540,10 +1770,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1570,6 +1816,10 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++msgid "log file %s: %s (ignored)" ++msgstr "" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1580,7 +1830,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "" + +@@ -1588,7 +1838,7 @@ msgstr "" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1604,7 +1854,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1632,11 +1888,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1679,7 +1935,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1691,7 +1947,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1728,7 +1984,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1744,7 +2000,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1752,11 +2008,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1783,7 +2039,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1831,22 +2087,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1864,19 +2137,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1922,13 +2200,33 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++msgid "ssh-inject: no public key file found in %s" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + msgid "stopped by signal %d" + msgstr "გაჩერდა სიგნალით %d" +@@ -1941,11 +2239,15 @@ msgstr "" + msgid "subprocess signalled or stopped by signal %d" + msgstr "" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1955,15 +2257,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1976,7 +2284,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2033,7 +2341,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2041,7 +2349,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2049,7 +2357,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2077,7 +2385,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2089,23 +2405,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2113,11 +2429,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2125,11 +2441,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2137,7 +2453,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2211,7 +2527,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2253,7 +2569,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/kn.po b/po/kn.po +index 430af051..bc830a00 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: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:50+0000\n" + "Last-Translator: Copied by Zanata \n" + "Language-Team: Kannada (http://www.transifex.com/projects/p/libguestfs/" +@@ -31,7 +31,7 @@ msgid "" + "Options:\n" + msgstr "" + +-#: common/mltools/tools_utils.ml:695 ++#: common/mltools/tools_utils.ml:695 common/mlcustomize/customize_run.ml:435 + msgid "%s (ignored)" + msgstr "" + +@@ -39,6 +39,10 @@ msgstr "" + msgid "%s did not return any output" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:191 ++msgid "%s does not exist in the guest" ++msgstr "" ++ + #: output/output_rhv.ml:273 + msgid "" + "%s does not exist or is not a directory.\n" +@@ -53,11 +57,19 @@ msgid "" + "this out through the RHV-M user interface." + msgstr "" + +-#. inspector/inspector.ml:149 ++#: common/mlcustomize/customize_run.ml:121 ++msgid "%s ignored for non-Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:194 ++msgid "%s is not a regular file in the guest" ++msgstr "" ++ ++#. inspector/inspector.ml:151 + #. inspector/inspector.ml:40 +-#. in-place/in_place.ml:146 ++#. in-place/in_place.ml:148 + #. in-place/in_place.ml:39 +-#: v2v/v2v.ml:196 v2v/v2v.ml:182 v2v/v2v.ml:162 v2v/v2v.ml:44 ++#: v2v/v2v.ml:198 v2v/v2v.ml:184 v2v/v2v.ml:164 v2v/v2v.ml:44 + msgid "%s option used more than once on the command line" + msgstr "" + +@@ -75,11 +87,15 @@ msgid "" + "%!" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:401 ++#: common/mlcustomize/inject_virtio_win.ml:434 + msgid "%s: cannot open virtio-win ISO file: %s" + msgstr "" + +-#: v2v/v2v.ml:316 ++#: common/mlcustomize/customize_run.ml:72 ++msgid "%s: command exited with an error" ++msgstr "" ++ ++#: v2v/v2v.ml:326 + msgid "" + "%s: convert a guest to use KVM\n" + "\n" +@@ -102,7 +118,7 @@ msgid "" + "read the man page virt-v2v(1).\n" + msgstr "" + +-#: in-place/in_place.ml:184 ++#: in-place/in_place.ml:194 + msgid "" + "%s: convert a guest to use KVM in-place\n" + "\n" +@@ -121,7 +137,7 @@ msgstr "" + msgid "%s: error: %s" + msgstr "" + +-#: inspector/inspector.ml:187 ++#: inspector/inspector.ml:197 + msgid "" + "%s: estimate disk space needed before virt-v2v conversion\n" + "\n" +@@ -147,12 +163,39 @@ msgstr "" + msgid "%s: warning: %s" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:268 +-#: common/mlcustomize/customize_cmdline.ml:371 ++#. common/mlcustomize/customize_cmdline.ml:270 ++#: common/mlcustomize/customize_cmdline.ml:379 + msgid "'CMD+ARGS'" + msgstr "" + +-#: v2v/v2v.ml:142 inspector/inspector.ml:129 in-place/in_place.ml:123 ++#: common/mlcustomize/customize_run.ml:141 ++msgid "" ++"--append-line: line must not contain newline characters. Use the --append-" ++"line option multiple times to add several lines." ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:160 ++msgid "--chown: could not parse numeric UID:GID from %s:%s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:224 ++msgid "" ++"--inject-blnsvr: blnsvr.exe not found in virtio-win source that you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:233 ++msgid "" ++"--inject-qemu-ga: QEMU Guest Agent MSI not found in virtio-win source that " ++"you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:249 ++msgid "" ++"--inject-virtio-win: virtio drivers were not found for this Windows version " ++"in the virtio-win source that you specified" ++msgstr "" ++ ++#: v2v/v2v.ml:144 inspector/inspector.ml:131 in-place/in_place.ml:125 + msgid "--mac ip prefix length field is out of range" + msgstr "" + +@@ -200,16 +243,16 @@ msgstr "" + msgid "-i ova: expecting an OVA file name on the command line" + msgstr "" + +-#: input/OVA.ml:356 ++#: input/OVA.ml:361 + msgid "" + "-i ova: invalid OVA file: path ‘%s’ references a file outside the archive" + msgstr "" + +-#: input/input_vmx.ml:53 ++#: input/input_vmx.ml:57 + msgid "-i vmx: cannot use -it vddk in this input mode" + msgstr "" + +-#: input/input_vmx.ml:56 ++#: input/input_vmx.ml:60 + msgid "-i vmx: expecting a VMX file or ssh:// URI" + msgstr "" + +@@ -351,7 +394,7 @@ msgstr "" + msgid "-o vdsm: unknown vdsm-compat level ‘%s’" + msgstr "" + +-#: output/output.ml:100 ++#: output/output.ml:99 + msgid "-oo compressed option requires nbdcopy >= 1.13.5" + msgstr "" + +@@ -393,82 +436,114 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++msgid "Appending line to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++msgid "Attaching to compatible subscriptions" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++msgid "Changing permissions of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + msgid "Copy local files or directories from a tarball into image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++msgid "Copying: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:184 ++msgid "Deleting: %s" ++msgstr "" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "" +@@ -477,7 +552,7 @@ msgstr "" + msgid "Display version and exit" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -489,10 +564,14 @@ msgstr "" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "" +@@ -505,41 +584,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "" + +@@ -551,23 +630,27 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "" + +@@ -594,20 +677,41 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++msgid "Installing packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -615,26 +719,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -648,14 +760,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -723,26 +835,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -750,7 +862,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "" + +@@ -758,164 +870,205 @@ msgstr "" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++msgid "Registering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++msgid "Running: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -923,35 +1076,59 @@ msgstr "" + msgid "Set program name" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++msgid "Setting passwords" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++msgid "Setting the timezone: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -959,30 +1136,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -995,7 +1172,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1003,51 +1180,75 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++msgid "Truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++msgid "Uninstalling packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++msgid "Unregistering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++msgid "Updating packages" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++msgid "Uploading: %s to %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1055,10 +1256,14 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:391 ++msgid "Writing: %s" ++msgstr "" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1084,6 +1289,10 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++msgid "append_line: %s is not a file" ++msgstr "" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1128,7 +1337,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + msgid "cannot parse --mac ip prefix length field as an integer: %s" + msgstr "" + +@@ -1161,11 +1370,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "" + +@@ -1173,13 +1382,13 @@ msgstr "" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1210,8 +1419,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1219,7 +1428,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1240,7 +1449,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1264,7 +1473,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1316,7 +1525,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1336,7 +1545,7 @@ msgstr "" + msgid "exited with error %d" + msgstr "" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1354,11 +1563,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1366,15 +1575,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1396,7 +1605,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1411,14 +1620,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1435,7 +1655,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1458,7 +1678,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1507,13 +1727,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1525,7 +1745,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1541,10 +1761,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1571,6 +1807,10 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++msgid "log file %s: %s (ignored)" ++msgstr "" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1581,7 +1821,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "" + +@@ -1589,7 +1829,7 @@ msgstr "" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1605,7 +1845,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1633,11 +1879,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1680,7 +1926,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1692,7 +1938,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1729,7 +1975,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1745,7 +1991,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1753,11 +1999,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1784,7 +2030,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1832,22 +2078,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1865,19 +2128,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1923,13 +2191,33 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++msgid "ssh-inject: no public key file found in %s" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + msgid "stopped by signal %d" + msgstr "" +@@ -1942,11 +2230,15 @@ msgstr "" + msgid "subprocess signalled or stopped by signal %d" + msgstr "" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1956,15 +2248,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1977,7 +2275,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2034,7 +2332,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2042,7 +2340,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2050,7 +2348,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2076,7 +2374,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2088,23 +2394,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2112,11 +2418,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2124,11 +2430,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2136,7 +2442,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2210,7 +2516,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2252,7 +2558,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/ml.po b/po/ml.po +index 172994fb..e0e3d498 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: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:50+0000\n" + "Last-Translator: Copied by Zanata \n" + "Language-Team: Malayalam (http://www.transifex.com/projects/p/libguestfs/" +@@ -31,7 +31,7 @@ msgid "" + "Options:\n" + msgstr "" + +-#: common/mltools/tools_utils.ml:695 ++#: common/mltools/tools_utils.ml:695 common/mlcustomize/customize_run.ml:435 + msgid "%s (ignored)" + msgstr "" + +@@ -39,6 +39,10 @@ msgstr "" + msgid "%s did not return any output" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:191 ++msgid "%s does not exist in the guest" ++msgstr "" ++ + #: output/output_rhv.ml:273 + msgid "" + "%s does not exist or is not a directory.\n" +@@ -53,11 +57,19 @@ msgid "" + "this out through the RHV-M user interface." + msgstr "" + +-#. inspector/inspector.ml:149 ++#: common/mlcustomize/customize_run.ml:121 ++msgid "%s ignored for non-Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:194 ++msgid "%s is not a regular file in the guest" ++msgstr "" ++ ++#. inspector/inspector.ml:151 + #. inspector/inspector.ml:40 +-#. in-place/in_place.ml:146 ++#. in-place/in_place.ml:148 + #. in-place/in_place.ml:39 +-#: v2v/v2v.ml:196 v2v/v2v.ml:182 v2v/v2v.ml:162 v2v/v2v.ml:44 ++#: v2v/v2v.ml:198 v2v/v2v.ml:184 v2v/v2v.ml:164 v2v/v2v.ml:44 + msgid "%s option used more than once on the command line" + msgstr "" + +@@ -75,11 +87,15 @@ msgid "" + "%!" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:401 ++#: common/mlcustomize/inject_virtio_win.ml:434 + msgid "%s: cannot open virtio-win ISO file: %s" + msgstr "" + +-#: v2v/v2v.ml:316 ++#: common/mlcustomize/customize_run.ml:72 ++msgid "%s: command exited with an error" ++msgstr "" ++ ++#: v2v/v2v.ml:326 + msgid "" + "%s: convert a guest to use KVM\n" + "\n" +@@ -102,7 +118,7 @@ msgid "" + "read the man page virt-v2v(1).\n" + msgstr "" + +-#: in-place/in_place.ml:184 ++#: in-place/in_place.ml:194 + msgid "" + "%s: convert a guest to use KVM in-place\n" + "\n" +@@ -121,7 +137,7 @@ msgstr "" + msgid "%s: error: %s" + msgstr "" + +-#: inspector/inspector.ml:187 ++#: inspector/inspector.ml:197 + msgid "" + "%s: estimate disk space needed before virt-v2v conversion\n" + "\n" +@@ -147,12 +163,39 @@ msgstr "" + msgid "%s: warning: %s" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:268 +-#: common/mlcustomize/customize_cmdline.ml:371 ++#. common/mlcustomize/customize_cmdline.ml:270 ++#: common/mlcustomize/customize_cmdline.ml:379 + msgid "'CMD+ARGS'" + msgstr "" + +-#: v2v/v2v.ml:142 inspector/inspector.ml:129 in-place/in_place.ml:123 ++#: common/mlcustomize/customize_run.ml:141 ++msgid "" ++"--append-line: line must not contain newline characters. Use the --append-" ++"line option multiple times to add several lines." ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:160 ++msgid "--chown: could not parse numeric UID:GID from %s:%s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:224 ++msgid "" ++"--inject-blnsvr: blnsvr.exe not found in virtio-win source that you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:233 ++msgid "" ++"--inject-qemu-ga: QEMU Guest Agent MSI not found in virtio-win source that " ++"you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:249 ++msgid "" ++"--inject-virtio-win: virtio drivers were not found for this Windows version " ++"in the virtio-win source that you specified" ++msgstr "" ++ ++#: v2v/v2v.ml:144 inspector/inspector.ml:131 in-place/in_place.ml:125 + msgid "--mac ip prefix length field is out of range" + msgstr "" + +@@ -200,16 +243,16 @@ msgstr "" + msgid "-i ova: expecting an OVA file name on the command line" + msgstr "" + +-#: input/OVA.ml:356 ++#: input/OVA.ml:361 + msgid "" + "-i ova: invalid OVA file: path ‘%s’ references a file outside the archive" + msgstr "" + +-#: input/input_vmx.ml:53 ++#: input/input_vmx.ml:57 + msgid "-i vmx: cannot use -it vddk in this input mode" + msgstr "" + +-#: input/input_vmx.ml:56 ++#: input/input_vmx.ml:60 + msgid "-i vmx: expecting a VMX file or ssh:// URI" + msgstr "" + +@@ -351,7 +394,7 @@ msgstr "" + msgid "-o vdsm: unknown vdsm-compat level ‘%s’" + msgstr "" + +-#: output/output.ml:100 ++#: output/output.ml:99 + msgid "-oo compressed option requires nbdcopy >= 1.13.5" + msgstr "" + +@@ -393,82 +436,114 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++msgid "Appending line to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++msgid "Attaching to compatible subscriptions" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++msgid "Changing permissions of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + msgid "Copy local files or directories from a tarball into image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++msgid "Copying: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:184 ++msgid "Deleting: %s" ++msgstr "" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "" +@@ -477,7 +552,7 @@ msgstr "" + msgid "Display version and exit" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -489,10 +564,14 @@ msgstr "" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "" +@@ -505,41 +584,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "" + +@@ -551,23 +630,27 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "" + +@@ -594,20 +677,41 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++msgid "Installing packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -615,26 +719,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -648,14 +760,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -723,26 +835,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -750,7 +862,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "" + +@@ -758,164 +870,205 @@ msgstr "" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++msgid "Registering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++msgid "Running: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -923,35 +1076,59 @@ msgstr "" + msgid "Set program name" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++msgid "Setting passwords" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++msgid "Setting the timezone: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -959,30 +1136,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -995,7 +1172,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1003,51 +1180,75 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++msgid "Truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++msgid "Uninstalling packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++msgid "Unregistering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++msgid "Updating packages" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++msgid "Uploading: %s to %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1055,10 +1256,14 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:391 ++msgid "Writing: %s" ++msgstr "" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1084,6 +1289,10 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++msgid "append_line: %s is not a file" ++msgstr "" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1128,7 +1337,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + msgid "cannot parse --mac ip prefix length field as an integer: %s" + msgstr "" + +@@ -1161,11 +1370,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "" + +@@ -1173,13 +1382,13 @@ msgstr "" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1210,8 +1419,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1219,7 +1428,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1240,7 +1449,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1264,7 +1473,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1316,7 +1525,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1336,7 +1545,7 @@ msgstr "" + msgid "exited with error %d" + msgstr "" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1354,11 +1563,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1366,15 +1575,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1396,7 +1605,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1411,14 +1620,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1435,7 +1655,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1458,7 +1678,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1507,13 +1727,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1525,7 +1745,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1541,10 +1761,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1571,6 +1807,10 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++msgid "log file %s: %s (ignored)" ++msgstr "" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1581,7 +1821,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "" + +@@ -1589,7 +1829,7 @@ msgstr "" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1605,7 +1845,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1633,11 +1879,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1680,7 +1926,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1692,7 +1938,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1729,7 +1975,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1745,7 +1991,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1753,11 +1999,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1784,7 +2030,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1832,22 +2078,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1865,19 +2128,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1923,13 +2191,33 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++msgid "ssh-inject: no public key file found in %s" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + msgid "stopped by signal %d" + msgstr "" +@@ -1942,11 +2230,15 @@ msgstr "" + msgid "subprocess signalled or stopped by signal %d" + msgstr "" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1956,15 +2248,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1977,7 +2275,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2034,7 +2332,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2042,7 +2340,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2050,7 +2348,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2078,7 +2376,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2090,23 +2396,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2114,11 +2420,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2126,11 +2432,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2138,7 +2444,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2212,7 +2518,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2254,7 +2560,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/mr.po b/po/mr.po +index cfa072d6..931374e9 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: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:51+0000\n" + "Last-Translator: Copied by Zanata \n" + "Language-Team: Marathi (http://www.transifex.com/projects/p/libguestfs/" +@@ -32,7 +32,7 @@ msgid "" + "Options:\n" + msgstr "" + +-#: common/mltools/tools_utils.ml:695 ++#: common/mltools/tools_utils.ml:695 common/mlcustomize/customize_run.ml:435 + msgid "%s (ignored)" + msgstr "" + +@@ -40,6 +40,10 @@ msgstr "" + msgid "%s did not return any output" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:191 ++msgid "%s does not exist in the guest" ++msgstr "" ++ + #: output/output_rhv.ml:273 + msgid "" + "%s does not exist or is not a directory.\n" +@@ -54,11 +58,19 @@ msgid "" + "this out through the RHV-M user interface." + msgstr "" + +-#. inspector/inspector.ml:149 ++#: common/mlcustomize/customize_run.ml:121 ++msgid "%s ignored for non-Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:194 ++msgid "%s is not a regular file in the guest" ++msgstr "" ++ ++#. inspector/inspector.ml:151 + #. inspector/inspector.ml:40 +-#. in-place/in_place.ml:146 ++#. in-place/in_place.ml:148 + #. in-place/in_place.ml:39 +-#: v2v/v2v.ml:196 v2v/v2v.ml:182 v2v/v2v.ml:162 v2v/v2v.ml:44 ++#: v2v/v2v.ml:198 v2v/v2v.ml:184 v2v/v2v.ml:164 v2v/v2v.ml:44 + msgid "%s option used more than once on the command line" + msgstr "" + +@@ -76,11 +88,15 @@ msgid "" + "%!" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:401 ++#: common/mlcustomize/inject_virtio_win.ml:434 + msgid "%s: cannot open virtio-win ISO file: %s" + msgstr "" + +-#: v2v/v2v.ml:316 ++#: common/mlcustomize/customize_run.ml:72 ++msgid "%s: command exited with an error" ++msgstr "" ++ ++#: v2v/v2v.ml:326 + msgid "" + "%s: convert a guest to use KVM\n" + "\n" +@@ -103,7 +119,7 @@ msgid "" + "read the man page virt-v2v(1).\n" + msgstr "" + +-#: in-place/in_place.ml:184 ++#: in-place/in_place.ml:194 + msgid "" + "%s: convert a guest to use KVM in-place\n" + "\n" +@@ -122,7 +138,7 @@ msgstr "" + msgid "%s: error: %s" + msgstr "" + +-#: inspector/inspector.ml:187 ++#: inspector/inspector.ml:197 + msgid "" + "%s: estimate disk space needed before virt-v2v conversion\n" + "\n" +@@ -148,12 +164,39 @@ msgstr "" + msgid "%s: warning: %s" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:268 +-#: common/mlcustomize/customize_cmdline.ml:371 ++#. common/mlcustomize/customize_cmdline.ml:270 ++#: common/mlcustomize/customize_cmdline.ml:379 + msgid "'CMD+ARGS'" + msgstr "" + +-#: v2v/v2v.ml:142 inspector/inspector.ml:129 in-place/in_place.ml:123 ++#: common/mlcustomize/customize_run.ml:141 ++msgid "" ++"--append-line: line must not contain newline characters. Use the --append-" ++"line option multiple times to add several lines." ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:160 ++msgid "--chown: could not parse numeric UID:GID from %s:%s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:224 ++msgid "" ++"--inject-blnsvr: blnsvr.exe not found in virtio-win source that you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:233 ++msgid "" ++"--inject-qemu-ga: QEMU Guest Agent MSI not found in virtio-win source that " ++"you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:249 ++msgid "" ++"--inject-virtio-win: virtio drivers were not found for this Windows version " ++"in the virtio-win source that you specified" ++msgstr "" ++ ++#: v2v/v2v.ml:144 inspector/inspector.ml:131 in-place/in_place.ml:125 + msgid "--mac ip prefix length field is out of range" + msgstr "" + +@@ -201,16 +244,16 @@ msgstr "" + msgid "-i ova: expecting an OVA file name on the command line" + msgstr "" + +-#: input/OVA.ml:356 ++#: input/OVA.ml:361 + msgid "" + "-i ova: invalid OVA file: path ‘%s’ references a file outside the archive" + msgstr "" + +-#: input/input_vmx.ml:53 ++#: input/input_vmx.ml:57 + msgid "-i vmx: cannot use -it vddk in this input mode" + msgstr "" + +-#: input/input_vmx.ml:56 ++#: input/input_vmx.ml:60 + msgid "-i vmx: expecting a VMX file or ssh:// URI" + msgstr "" + +@@ -352,7 +395,7 @@ msgstr "" + msgid "-o vdsm: unknown vdsm-compat level ‘%s’" + msgstr "" + +-#: output/output.ml:100 ++#: output/output.ml:99 + msgid "-oo compressed option requires nbdcopy >= 1.13.5" + msgstr "" + +@@ -394,82 +437,114 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++msgid "Appending line to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++msgid "Attaching to compatible subscriptions" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++msgid "Changing permissions of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + msgid "Copy local files or directories from a tarball into image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++msgid "Copying: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:184 ++msgid "Deleting: %s" ++msgstr "" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "" +@@ -478,7 +553,7 @@ msgstr "" + msgid "Display version and exit" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -490,10 +565,14 @@ msgstr "" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "" +@@ -506,41 +585,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "" + +@@ -552,23 +631,27 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "" + +@@ -595,20 +678,41 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++msgid "Installing packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -616,26 +720,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -649,14 +761,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -724,26 +836,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -751,7 +863,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "" + +@@ -759,164 +871,205 @@ msgstr "" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++msgid "Registering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++msgid "Running: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -924,35 +1077,59 @@ msgstr "" + msgid "Set program name" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++msgid "Setting passwords" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++msgid "Setting the timezone: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -960,30 +1137,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -996,7 +1173,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1004,51 +1181,75 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++msgid "Truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++msgid "Uninstalling packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++msgid "Unregistering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++msgid "Updating packages" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++msgid "Uploading: %s to %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1056,10 +1257,14 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:391 ++msgid "Writing: %s" ++msgstr "" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1085,6 +1290,10 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++msgid "append_line: %s is not a file" ++msgstr "" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1129,7 +1338,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + msgid "cannot parse --mac ip prefix length field as an integer: %s" + msgstr "" + +@@ -1162,11 +1371,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "" + +@@ -1174,13 +1383,13 @@ msgstr "" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1211,8 +1420,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1220,7 +1429,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1243,7 +1452,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1267,7 +1476,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1319,7 +1528,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1339,7 +1548,7 @@ msgstr "" + msgid "exited with error %d" + msgstr "" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1357,11 +1566,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1369,15 +1578,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1399,7 +1608,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1414,14 +1623,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1438,7 +1658,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1461,7 +1681,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1510,13 +1730,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1528,7 +1748,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1544,10 +1764,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1574,6 +1810,10 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++msgid "log file %s: %s (ignored)" ++msgstr "" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1584,7 +1824,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "" + +@@ -1592,7 +1832,7 @@ msgstr "" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1608,7 +1848,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1636,11 +1882,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1683,7 +1929,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1695,7 +1941,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1732,7 +1978,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1748,7 +1994,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1756,11 +2002,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1787,7 +2033,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1835,22 +2081,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1868,19 +2131,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1926,13 +2194,33 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++msgid "ssh-inject: no public key file found in %s" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + msgid "stopped by signal %d" + msgstr "" +@@ -1945,11 +2233,15 @@ msgstr "" + msgid "subprocess signalled or stopped by signal %d" + msgstr "" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1959,15 +2251,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1980,7 +2278,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2037,7 +2335,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2045,7 +2343,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2053,7 +2351,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2081,7 +2379,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2093,23 +2399,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2117,11 +2423,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2129,11 +2435,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2141,7 +2447,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2215,7 +2521,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2257,7 +2563,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/nl.po b/po/nl.po +index 7757ba38..f94cd754 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: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:51+0000\n" + "Last-Translator: Copied by Zanata \n" + "Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/" +@@ -33,7 +33,7 @@ msgid "" + "Options:\n" + msgstr "" + +-#: common/mltools/tools_utils.ml:695 ++#: common/mltools/tools_utils.ml:695 common/mlcustomize/customize_run.ml:435 + msgid "%s (ignored)" + msgstr "" + +@@ -41,6 +41,10 @@ msgstr "" + msgid "%s did not return any output" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:191 ++msgid "%s does not exist in the guest" ++msgstr "" ++ + #: output/output_rhv.ml:273 + msgid "" + "%s does not exist or is not a directory.\n" +@@ -55,11 +59,19 @@ msgid "" + "this out through the RHV-M user interface." + msgstr "" + +-#. inspector/inspector.ml:149 ++#: common/mlcustomize/customize_run.ml:121 ++msgid "%s ignored for non-Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:194 ++msgid "%s is not a regular file in the guest" ++msgstr "" ++ ++#. inspector/inspector.ml:151 + #. inspector/inspector.ml:40 +-#. in-place/in_place.ml:146 ++#. in-place/in_place.ml:148 + #. in-place/in_place.ml:39 +-#: v2v/v2v.ml:196 v2v/v2v.ml:182 v2v/v2v.ml:162 v2v/v2v.ml:44 ++#: v2v/v2v.ml:198 v2v/v2v.ml:184 v2v/v2v.ml:164 v2v/v2v.ml:44 + msgid "%s option used more than once on the command line" + msgstr "" + +@@ -77,11 +89,15 @@ msgid "" + "%!" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:401 ++#: common/mlcustomize/inject_virtio_win.ml:434 + msgid "%s: cannot open virtio-win ISO file: %s" + msgstr "" + +-#: v2v/v2v.ml:316 ++#: common/mlcustomize/customize_run.ml:72 ++msgid "%s: command exited with an error" ++msgstr "" ++ ++#: v2v/v2v.ml:326 + msgid "" + "%s: convert a guest to use KVM\n" + "\n" +@@ -104,7 +120,7 @@ msgid "" + "read the man page virt-v2v(1).\n" + msgstr "" + +-#: in-place/in_place.ml:184 ++#: in-place/in_place.ml:194 + msgid "" + "%s: convert a guest to use KVM in-place\n" + "\n" +@@ -123,7 +139,7 @@ msgstr "" + msgid "%s: error: %s" + msgstr "" + +-#: inspector/inspector.ml:187 ++#: inspector/inspector.ml:197 + msgid "" + "%s: estimate disk space needed before virt-v2v conversion\n" + "\n" +@@ -149,12 +165,39 @@ msgstr "" + msgid "%s: warning: %s" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:268 +-#: common/mlcustomize/customize_cmdline.ml:371 ++#. common/mlcustomize/customize_cmdline.ml:270 ++#: common/mlcustomize/customize_cmdline.ml:379 + msgid "'CMD+ARGS'" + msgstr "" + +-#: v2v/v2v.ml:142 inspector/inspector.ml:129 in-place/in_place.ml:123 ++#: common/mlcustomize/customize_run.ml:141 ++msgid "" ++"--append-line: line must not contain newline characters. Use the --append-" ++"line option multiple times to add several lines." ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:160 ++msgid "--chown: could not parse numeric UID:GID from %s:%s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:224 ++msgid "" ++"--inject-blnsvr: blnsvr.exe not found in virtio-win source that you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:233 ++msgid "" ++"--inject-qemu-ga: QEMU Guest Agent MSI not found in virtio-win source that " ++"you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:249 ++msgid "" ++"--inject-virtio-win: virtio drivers were not found for this Windows version " ++"in the virtio-win source that you specified" ++msgstr "" ++ ++#: v2v/v2v.ml:144 inspector/inspector.ml:131 in-place/in_place.ml:125 + #, fuzzy + #| msgid "credential index out of range" + msgid "--mac ip prefix length field is out of range" +@@ -204,16 +247,16 @@ msgstr "" + msgid "-i ova: expecting an OVA file name on the command line" + msgstr "" + +-#: input/OVA.ml:356 ++#: input/OVA.ml:361 + msgid "" + "-i ova: invalid OVA file: path ‘%s’ references a file outside the archive" + msgstr "" + +-#: input/input_vmx.ml:53 ++#: input/input_vmx.ml:57 + msgid "-i vmx: cannot use -it vddk in this input mode" + msgstr "" + +-#: input/input_vmx.ml:56 ++#: input/input_vmx.ml:60 + msgid "-i vmx: expecting a VMX file or ssh:// URI" + msgstr "" + +@@ -355,7 +398,7 @@ msgstr "" + msgid "-o vdsm: unknown vdsm-compat level ‘%s’" + msgstr "" + +-#: output/output.ml:100 ++#: output/output.ml:99 + msgid "-oo compressed option requires nbdcopy >= 1.13.5" + msgstr "" + +@@ -397,82 +440,114 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++msgid "Appending line to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++msgid "Attaching to compatible subscriptions" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++msgid "Changing permissions of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + msgid "Copy local files or directories from a tarball into image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++msgid "Copying: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:184 ++msgid "Deleting: %s" ++msgstr "" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "" +@@ -481,7 +556,7 @@ msgstr "" + msgid "Display version and exit" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -493,10 +568,14 @@ msgstr "" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "" +@@ -509,41 +588,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "" + +@@ -555,23 +634,27 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "" + +@@ -598,20 +681,41 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++msgid "Installing packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -619,26 +723,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -652,14 +764,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -727,26 +839,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -754,7 +866,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "" + +@@ -762,164 +874,205 @@ msgstr "" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++msgid "Registering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++msgid "Running: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -927,35 +1080,59 @@ msgstr "" + msgid "Set program name" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++msgid "Setting passwords" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++msgid "Setting the timezone: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -963,30 +1140,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -999,7 +1176,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1007,51 +1184,75 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++msgid "Truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++msgid "Uninstalling packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++msgid "Unregistering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++msgid "Updating packages" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++msgid "Uploading: %s to %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1059,10 +1260,14 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:391 ++msgid "Writing: %s" ++msgstr "" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1088,6 +1293,10 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++msgid "append_line: %s is not a file" ++msgstr "" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1132,7 +1341,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + #, fuzzy + #| msgid "credential index out of range" + msgid "cannot parse --mac ip prefix length field as an integer: %s" +@@ -1167,11 +1376,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "" + +@@ -1179,13 +1388,13 @@ msgstr "" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1216,8 +1425,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1225,7 +1434,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1248,7 +1457,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1272,7 +1481,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1324,7 +1533,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1344,7 +1553,7 @@ msgstr "" + msgid "exited with error %d" + msgstr "" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1362,11 +1571,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1374,15 +1583,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1404,7 +1613,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1419,14 +1628,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1443,7 +1663,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1466,7 +1686,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1515,13 +1735,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1533,7 +1753,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1549,10 +1769,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1579,6 +1815,10 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++msgid "log file %s: %s (ignored)" ++msgstr "" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1589,7 +1829,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "" + +@@ -1597,7 +1837,7 @@ msgstr "" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1613,7 +1853,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1641,11 +1887,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1688,7 +1934,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1700,7 +1946,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1737,7 +1983,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1753,7 +1999,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1761,11 +2007,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1792,7 +2038,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1840,22 +2086,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1873,19 +2136,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1931,13 +2199,33 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++msgid "ssh-inject: no public key file found in %s" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + msgid "stopped by signal %d" + msgstr "" +@@ -1950,11 +2238,15 @@ msgstr "" + msgid "subprocess signalled or stopped by signal %d" + msgstr "" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1964,15 +2256,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1985,7 +2283,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2042,7 +2340,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2050,7 +2348,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2058,7 +2356,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2086,7 +2384,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2098,23 +2404,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2122,11 +2428,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2134,11 +2440,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2146,7 +2452,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2220,7 +2526,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2262,7 +2568,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/or.po b/po/or.po +index cb0b6f9a..2fe0840a 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: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:51+0000\n" + "Last-Translator: Copied by Zanata \n" + "Language-Team: Oriya (http://www.transifex.com/projects/p/libguestfs/" +@@ -31,7 +31,7 @@ msgid "" + "Options:\n" + msgstr "" + +-#: common/mltools/tools_utils.ml:695 ++#: common/mltools/tools_utils.ml:695 common/mlcustomize/customize_run.ml:435 + msgid "%s (ignored)" + msgstr "" + +@@ -39,6 +39,10 @@ msgstr "" + msgid "%s did not return any output" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:191 ++msgid "%s does not exist in the guest" ++msgstr "" ++ + #: output/output_rhv.ml:273 + msgid "" + "%s does not exist or is not a directory.\n" +@@ -53,11 +57,19 @@ msgid "" + "this out through the RHV-M user interface." + msgstr "" + +-#. inspector/inspector.ml:149 ++#: common/mlcustomize/customize_run.ml:121 ++msgid "%s ignored for non-Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:194 ++msgid "%s is not a regular file in the guest" ++msgstr "" ++ ++#. inspector/inspector.ml:151 + #. inspector/inspector.ml:40 +-#. in-place/in_place.ml:146 ++#. in-place/in_place.ml:148 + #. in-place/in_place.ml:39 +-#: v2v/v2v.ml:196 v2v/v2v.ml:182 v2v/v2v.ml:162 v2v/v2v.ml:44 ++#: v2v/v2v.ml:198 v2v/v2v.ml:184 v2v/v2v.ml:164 v2v/v2v.ml:44 + msgid "%s option used more than once on the command line" + msgstr "" + +@@ -75,11 +87,15 @@ msgid "" + "%!" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:401 ++#: common/mlcustomize/inject_virtio_win.ml:434 + msgid "%s: cannot open virtio-win ISO file: %s" + msgstr "" + +-#: v2v/v2v.ml:316 ++#: common/mlcustomize/customize_run.ml:72 ++msgid "%s: command exited with an error" ++msgstr "" ++ ++#: v2v/v2v.ml:326 + msgid "" + "%s: convert a guest to use KVM\n" + "\n" +@@ -102,7 +118,7 @@ msgid "" + "read the man page virt-v2v(1).\n" + msgstr "" + +-#: in-place/in_place.ml:184 ++#: in-place/in_place.ml:194 + msgid "" + "%s: convert a guest to use KVM in-place\n" + "\n" +@@ -121,7 +137,7 @@ msgstr "" + msgid "%s: error: %s" + msgstr "" + +-#: inspector/inspector.ml:187 ++#: inspector/inspector.ml:197 + msgid "" + "%s: estimate disk space needed before virt-v2v conversion\n" + "\n" +@@ -147,12 +163,39 @@ msgstr "" + msgid "%s: warning: %s" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:268 +-#: common/mlcustomize/customize_cmdline.ml:371 ++#. common/mlcustomize/customize_cmdline.ml:270 ++#: common/mlcustomize/customize_cmdline.ml:379 + msgid "'CMD+ARGS'" + msgstr "" + +-#: v2v/v2v.ml:142 inspector/inspector.ml:129 in-place/in_place.ml:123 ++#: common/mlcustomize/customize_run.ml:141 ++msgid "" ++"--append-line: line must not contain newline characters. Use the --append-" ++"line option multiple times to add several lines." ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:160 ++msgid "--chown: could not parse numeric UID:GID from %s:%s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:224 ++msgid "" ++"--inject-blnsvr: blnsvr.exe not found in virtio-win source that you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:233 ++msgid "" ++"--inject-qemu-ga: QEMU Guest Agent MSI not found in virtio-win source that " ++"you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:249 ++msgid "" ++"--inject-virtio-win: virtio drivers were not found for this Windows version " ++"in the virtio-win source that you specified" ++msgstr "" ++ ++#: v2v/v2v.ml:144 inspector/inspector.ml:131 in-place/in_place.ml:125 + msgid "--mac ip prefix length field is out of range" + msgstr "" + +@@ -200,16 +243,16 @@ msgstr "" + msgid "-i ova: expecting an OVA file name on the command line" + msgstr "" + +-#: input/OVA.ml:356 ++#: input/OVA.ml:361 + msgid "" + "-i ova: invalid OVA file: path ‘%s’ references a file outside the archive" + msgstr "" + +-#: input/input_vmx.ml:53 ++#: input/input_vmx.ml:57 + msgid "-i vmx: cannot use -it vddk in this input mode" + msgstr "" + +-#: input/input_vmx.ml:56 ++#: input/input_vmx.ml:60 + msgid "-i vmx: expecting a VMX file or ssh:// URI" + msgstr "" + +@@ -351,7 +394,7 @@ msgstr "" + msgid "-o vdsm: unknown vdsm-compat level ‘%s’" + msgstr "" + +-#: output/output.ml:100 ++#: output/output.ml:99 + msgid "-oo compressed option requires nbdcopy >= 1.13.5" + msgstr "" + +@@ -393,82 +436,114 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++msgid "Appending line to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++msgid "Attaching to compatible subscriptions" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++msgid "Changing permissions of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + msgid "Copy local files or directories from a tarball into image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++msgid "Copying: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:184 ++msgid "Deleting: %s" ++msgstr "" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "" +@@ -477,7 +552,7 @@ msgstr "" + msgid "Display version and exit" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -489,10 +564,14 @@ msgstr "" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "" +@@ -505,41 +584,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "" + +@@ -551,23 +630,27 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "" + +@@ -594,20 +677,41 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++msgid "Installing packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -615,26 +719,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -648,14 +760,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -723,26 +835,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -750,7 +862,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "" + +@@ -758,164 +870,205 @@ msgstr "" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++msgid "Registering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++msgid "Running: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -923,35 +1076,59 @@ msgstr "" + msgid "Set program name" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++msgid "Setting passwords" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++msgid "Setting the timezone: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -959,30 +1136,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -995,7 +1172,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1003,51 +1180,75 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++msgid "Truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++msgid "Uninstalling packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++msgid "Unregistering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++msgid "Updating packages" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++msgid "Uploading: %s to %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1055,10 +1256,14 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:391 ++msgid "Writing: %s" ++msgstr "" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1084,6 +1289,10 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++msgid "append_line: %s is not a file" ++msgstr "" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1128,7 +1337,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + msgid "cannot parse --mac ip prefix length field as an integer: %s" + msgstr "" + +@@ -1161,11 +1370,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "" + +@@ -1173,13 +1382,13 @@ msgstr "" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1210,8 +1419,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1219,7 +1428,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1240,7 +1449,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1264,7 +1473,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1316,7 +1525,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1336,7 +1545,7 @@ msgstr "" + msgid "exited with error %d" + msgstr "" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1354,11 +1563,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1366,15 +1575,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1396,7 +1605,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1411,14 +1620,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1435,7 +1655,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1458,7 +1678,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1507,13 +1727,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1525,7 +1745,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1541,10 +1761,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1571,6 +1807,10 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++msgid "log file %s: %s (ignored)" ++msgstr "" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1581,7 +1821,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "" + +@@ -1589,7 +1829,7 @@ msgstr "" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1605,7 +1845,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1633,11 +1879,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1680,7 +1926,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1692,7 +1938,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1729,7 +1975,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1745,7 +1991,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1753,11 +1999,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1784,7 +2030,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1832,22 +2078,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1865,19 +2128,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1923,13 +2191,33 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++msgid "ssh-inject: no public key file found in %s" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + msgid "stopped by signal %d" + msgstr "" +@@ -1942,11 +2230,15 @@ msgstr "" + msgid "subprocess signalled or stopped by signal %d" + msgstr "" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1956,15 +2248,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1977,7 +2275,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2034,7 +2332,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2042,7 +2340,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2050,7 +2348,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2078,7 +2376,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2090,23 +2396,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2114,11 +2420,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2126,11 +2432,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2138,7 +2444,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2212,7 +2518,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2254,7 +2560,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/pa.po b/po/pa.po +index 9b4e9bca..f3237c94 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: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2015-02-21 10:52+0000\n" + "Last-Translator: Copied by Zanata \n" + "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/" +@@ -32,7 +32,7 @@ msgid "" + "Options:\n" + msgstr "" + +-#: common/mltools/tools_utils.ml:695 ++#: common/mltools/tools_utils.ml:695 common/mlcustomize/customize_run.ml:435 + msgid "%s (ignored)" + msgstr "" + +@@ -40,6 +40,10 @@ msgstr "" + msgid "%s did not return any output" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:191 ++msgid "%s does not exist in the guest" ++msgstr "" ++ + #: output/output_rhv.ml:273 + msgid "" + "%s does not exist or is not a directory.\n" +@@ -54,11 +58,19 @@ msgid "" + "this out through the RHV-M user interface." + msgstr "" + +-#. inspector/inspector.ml:149 ++#: common/mlcustomize/customize_run.ml:121 ++msgid "%s ignored for non-Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:194 ++msgid "%s is not a regular file in the guest" ++msgstr "" ++ ++#. inspector/inspector.ml:151 + #. inspector/inspector.ml:40 +-#. in-place/in_place.ml:146 ++#. in-place/in_place.ml:148 + #. in-place/in_place.ml:39 +-#: v2v/v2v.ml:196 v2v/v2v.ml:182 v2v/v2v.ml:162 v2v/v2v.ml:44 ++#: v2v/v2v.ml:198 v2v/v2v.ml:184 v2v/v2v.ml:164 v2v/v2v.ml:44 + msgid "%s option used more than once on the command line" + msgstr "" + +@@ -76,11 +88,15 @@ msgid "" + "%!" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:401 ++#: common/mlcustomize/inject_virtio_win.ml:434 + msgid "%s: cannot open virtio-win ISO file: %s" + msgstr "" + +-#: v2v/v2v.ml:316 ++#: common/mlcustomize/customize_run.ml:72 ++msgid "%s: command exited with an error" ++msgstr "" ++ ++#: v2v/v2v.ml:326 + msgid "" + "%s: convert a guest to use KVM\n" + "\n" +@@ -103,7 +119,7 @@ msgid "" + "read the man page virt-v2v(1).\n" + msgstr "" + +-#: in-place/in_place.ml:184 ++#: in-place/in_place.ml:194 + msgid "" + "%s: convert a guest to use KVM in-place\n" + "\n" +@@ -122,7 +138,7 @@ msgstr "" + msgid "%s: error: %s" + msgstr "" + +-#: inspector/inspector.ml:187 ++#: inspector/inspector.ml:197 + msgid "" + "%s: estimate disk space needed before virt-v2v conversion\n" + "\n" +@@ -148,12 +164,39 @@ msgstr "" + msgid "%s: warning: %s" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:268 +-#: common/mlcustomize/customize_cmdline.ml:371 ++#. common/mlcustomize/customize_cmdline.ml:270 ++#: common/mlcustomize/customize_cmdline.ml:379 + msgid "'CMD+ARGS'" + msgstr "" + +-#: v2v/v2v.ml:142 inspector/inspector.ml:129 in-place/in_place.ml:123 ++#: common/mlcustomize/customize_run.ml:141 ++msgid "" ++"--append-line: line must not contain newline characters. Use the --append-" ++"line option multiple times to add several lines." ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:160 ++msgid "--chown: could not parse numeric UID:GID from %s:%s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:224 ++msgid "" ++"--inject-blnsvr: blnsvr.exe not found in virtio-win source that you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:233 ++msgid "" ++"--inject-qemu-ga: QEMU Guest Agent MSI not found in virtio-win source that " ++"you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:249 ++msgid "" ++"--inject-virtio-win: virtio drivers were not found for this Windows version " ++"in the virtio-win source that you specified" ++msgstr "" ++ ++#: v2v/v2v.ml:144 inspector/inspector.ml:131 in-place/in_place.ml:125 + msgid "--mac ip prefix length field is out of range" + msgstr "" + +@@ -201,16 +244,16 @@ msgstr "" + msgid "-i ova: expecting an OVA file name on the command line" + msgstr "" + +-#: input/OVA.ml:356 ++#: input/OVA.ml:361 + msgid "" + "-i ova: invalid OVA file: path ‘%s’ references a file outside the archive" + msgstr "" + +-#: input/input_vmx.ml:53 ++#: input/input_vmx.ml:57 + msgid "-i vmx: cannot use -it vddk in this input mode" + msgstr "" + +-#: input/input_vmx.ml:56 ++#: input/input_vmx.ml:60 + msgid "-i vmx: expecting a VMX file or ssh:// URI" + msgstr "" + +@@ -352,7 +395,7 @@ msgstr "" + msgid "-o vdsm: unknown vdsm-compat level ‘%s’" + msgstr "" + +-#: output/output.ml:100 ++#: output/output.ml:99 + msgid "-oo compressed option requires nbdcopy >= 1.13.5" + msgstr "" + +@@ -394,82 +437,114 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++msgid "Appending line to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++msgid "Attaching to compatible subscriptions" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++msgid "Changing permissions of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + msgid "Copy local files or directories from a tarball into image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++msgid "Copying: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:184 ++msgid "Deleting: %s" ++msgstr "" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "" +@@ -478,7 +553,7 @@ msgstr "" + msgid "Display version and exit" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -490,10 +565,14 @@ msgstr "" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "" +@@ -506,41 +585,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "" + +@@ -552,23 +631,27 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "" + +@@ -595,20 +678,41 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++msgid "Installing packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -616,26 +720,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -649,14 +761,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -724,26 +836,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -751,7 +863,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "" + +@@ -759,164 +871,205 @@ msgstr "" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++msgid "Registering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++msgid "Running: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -924,35 +1077,59 @@ msgstr "" + msgid "Set program name" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++msgid "Setting passwords" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++msgid "Setting the timezone: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -960,30 +1137,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -996,7 +1173,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1004,51 +1181,75 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++msgid "Truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++msgid "Uninstalling packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++msgid "Unregistering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++msgid "Updating packages" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++msgid "Uploading: %s to %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1056,10 +1257,14 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:391 ++msgid "Writing: %s" ++msgstr "" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1085,6 +1290,10 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++msgid "append_line: %s is not a file" ++msgstr "" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1129,7 +1338,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + msgid "cannot parse --mac ip prefix length field as an integer: %s" + msgstr "" + +@@ -1162,11 +1371,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "" + +@@ -1174,13 +1383,13 @@ msgstr "" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1211,8 +1420,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1220,7 +1429,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1243,7 +1452,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1267,7 +1476,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1319,7 +1528,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1339,7 +1548,7 @@ msgstr "" + msgid "exited with error %d" + msgstr "" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1357,11 +1566,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1369,15 +1578,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1399,7 +1608,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1414,14 +1623,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1438,7 +1658,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1461,7 +1681,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1510,13 +1730,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1528,7 +1748,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1544,10 +1764,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1574,6 +1810,10 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++msgid "log file %s: %s (ignored)" ++msgstr "" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1584,7 +1824,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "" + +@@ -1592,7 +1832,7 @@ msgstr "" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1608,7 +1848,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1636,11 +1882,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1683,7 +1929,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1695,7 +1941,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1732,7 +1978,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1748,7 +1994,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1756,11 +2002,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1787,7 +2033,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1835,22 +2081,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1868,19 +2131,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1926,13 +2194,33 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++msgid "ssh-inject: no public key file found in %s" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + msgid "stopped by signal %d" + msgstr "" +@@ -1945,11 +2233,15 @@ msgstr "" + msgid "subprocess signalled or stopped by signal %d" + msgstr "" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1959,15 +2251,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1980,7 +2278,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2037,7 +2335,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2045,7 +2343,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2053,7 +2351,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2081,7 +2379,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2093,23 +2399,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2117,11 +2423,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2129,11 +2435,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2141,7 +2447,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2215,7 +2521,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2257,7 +2563,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/pl.po b/po/pl.po +index bb8acef7..4b6f1b8a 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: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2024-01-15 13:36+0000\n" + "Last-Translator: Weblate Translation Memory \n" +@@ -39,7 +39,7 @@ msgstr "" + "%s\n" + "Opcje:\n" + +-#: common/mltools/tools_utils.ml:695 ++#: common/mltools/tools_utils.ml:695 common/mlcustomize/customize_run.ml:435 + msgid "%s (ignored)" + msgstr "%s (zignorowane)" + +@@ -47,6 +47,10 @@ msgstr "%s (zignorowane)" + msgid "%s did not return any output" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:191 ++msgid "%s does not exist in the guest" ++msgstr "" ++ + #: output/output_rhv.ml:273 + msgid "" + "%s does not exist or is not a directory.\n" +@@ -61,11 +65,19 @@ msgid "" + "this out through the RHV-M user interface." + msgstr "" + +-#. inspector/inspector.ml:149 ++#: common/mlcustomize/customize_run.ml:121 ++msgid "%s ignored for non-Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:194 ++msgid "%s is not a regular file in the guest" ++msgstr "" ++ ++#. inspector/inspector.ml:151 + #. inspector/inspector.ml:40 +-#. in-place/in_place.ml:146 ++#. in-place/in_place.ml:148 + #. in-place/in_place.ml:39 +-#: v2v/v2v.ml:196 v2v/v2v.ml:182 v2v/v2v.ml:162 v2v/v2v.ml:44 ++#: v2v/v2v.ml:198 v2v/v2v.ml:184 v2v/v2v.ml:164 v2v/v2v.ml:44 + msgid "%s option used more than once on the command line" + msgstr "" + +@@ -83,11 +95,15 @@ msgid "" + "%!" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:401 ++#: common/mlcustomize/inject_virtio_win.ml:434 + msgid "%s: cannot open virtio-win ISO file: %s" + msgstr "" + +-#: v2v/v2v.ml:316 ++#: common/mlcustomize/customize_run.ml:72 ++msgid "%s: command exited with an error" ++msgstr "" ++ ++#: v2v/v2v.ml:326 + msgid "" + "%s: convert a guest to use KVM\n" + "\n" +@@ -110,7 +126,7 @@ msgid "" + "read the man page virt-v2v(1).\n" + msgstr "" + +-#: in-place/in_place.ml:184 ++#: in-place/in_place.ml:194 + msgid "" + "%s: convert a guest to use KVM in-place\n" + "\n" +@@ -129,7 +145,7 @@ msgstr "" + msgid "%s: error: %s" + msgstr "%s: błąd: %s" + +-#: inspector/inspector.ml:187 ++#: inspector/inspector.ml:197 + msgid "" + "%s: estimate disk space needed before virt-v2v conversion\n" + "\n" +@@ -155,12 +171,39 @@ msgstr "" + msgid "%s: warning: %s" + msgstr "%s: ostrzeżenie: %s" + +-#. common/mlcustomize/customize_cmdline.ml:268 +-#: common/mlcustomize/customize_cmdline.ml:371 ++#. common/mlcustomize/customize_cmdline.ml:270 ++#: common/mlcustomize/customize_cmdline.ml:379 + msgid "'CMD+ARGS'" + msgstr "" + +-#: v2v/v2v.ml:142 inspector/inspector.ml:129 in-place/in_place.ml:123 ++#: common/mlcustomize/customize_run.ml:141 ++msgid "" ++"--append-line: line must not contain newline characters. Use the --append-" ++"line option multiple times to add several lines." ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:160 ++msgid "--chown: could not parse numeric UID:GID from %s:%s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:224 ++msgid "" ++"--inject-blnsvr: blnsvr.exe not found in virtio-win source that you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:233 ++msgid "" ++"--inject-qemu-ga: QEMU Guest Agent MSI not found in virtio-win source that " ++"you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:249 ++msgid "" ++"--inject-virtio-win: virtio drivers were not found for this Windows version " ++"in the virtio-win source that you specified" ++msgstr "" ++ ++#: v2v/v2v.ml:144 inspector/inspector.ml:131 in-place/in_place.ml:125 + msgid "--mac ip prefix length field is out of range" + msgstr "" + +@@ -208,16 +251,16 @@ msgstr "" + msgid "-i ova: expecting an OVA file name on the command line" + msgstr "" + +-#: input/OVA.ml:356 ++#: input/OVA.ml:361 + msgid "" + "-i ova: invalid OVA file: path ‘%s’ references a file outside the archive" + msgstr "" + +-#: input/input_vmx.ml:53 ++#: input/input_vmx.ml:57 + msgid "-i vmx: cannot use -it vddk in this input mode" + msgstr "" + +-#: input/input_vmx.ml:56 ++#: input/input_vmx.ml:60 + msgid "-i vmx: expecting a VMX file or ssh:// URI" + msgstr "" + +@@ -359,7 +402,7 @@ msgstr "" + msgid "-o vdsm: unknown vdsm-compat level ‘%s’" + msgstr "" + +-#: output/output.ml:100 ++#: output/output.ml:99 + msgid "-oo compressed option requires nbdcopy >= 1.13.5" + msgstr "" + +@@ -401,84 +444,116 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++msgid "Appending line to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++msgid "Attaching to compatible subscriptions" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++msgid "Changing permissions of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + #, fuzzy + #| msgid "Copy local files or directories into image" + msgid "Copy local files or directories from a tarball into image" + msgstr "Kopiuje lokalne pliki lub katalogi do obrazu" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "Kopiuje lokalne pliki lub katalogi do obrazu" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++msgid "Copying: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "Tworzy katalog" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "Tworzy dowiązania symboliczne" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "KATALOG" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:184 ++msgid "Deleting: %s" ++msgstr "" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "" +@@ -487,7 +562,7 @@ msgstr "" + msgid "Display version and exit" + msgstr "Wyświetla wersję i kończy działanie" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -499,10 +574,14 @@ msgstr "" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "" +@@ -515,41 +594,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "PLIK" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "NAZWA-PLIKU" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "NAZWA-KOMPUTERA" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "" + +@@ -561,23 +640,27 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "" + +@@ -604,20 +687,43 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++#, fuzzy ++#| msgid "Uninstall package(s)" ++msgid "Installing packages: %s" ++msgstr "Odinstalowuje pakiety" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "Adres URI biblioteki libvirt" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -625,26 +731,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -658,14 +772,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -733,26 +847,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "ŚCIEŻKA" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -760,7 +874,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "" + +@@ -768,164 +882,207 @@ msgstr "" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++msgid "Registering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++#, fuzzy ++#| msgid "%s: warning: %s" ++msgid "Running: %s" ++msgstr "%s: ostrzeżenie: %s" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "SKRYPT" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -933,35 +1090,59 @@ msgstr "" + msgid "Set program name" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++msgid "Setting passwords" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++msgid "Setting the timezone: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -969,30 +1150,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -1005,7 +1186,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1013,51 +1194,83 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "Skraca plik do zerowego rozmiaru" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++#, fuzzy ++#| msgid "%s: warning: %s" ++msgid "Truncating: %s" ++msgstr "%s: ostrzeżenie: %s" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "Odinstalowuje pakiety" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++#, fuzzy ++#| msgid "Uninstall package(s)" ++msgid "Uninstalling packages: %s" ++msgstr "Odinstalowuje pakiety" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++msgid "Unregistering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++#, fuzzy ++#| msgid "Uninstall package(s)" ++msgid "Updating packages" ++msgstr "Odinstalowuje pakiety" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++#, fuzzy ++#| msgid "downloading %s" ++msgid "Uploading: %s to %s" ++msgstr "pobieranie %s" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1065,10 +1278,16 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:391 ++#, fuzzy ++#| msgid "%s: warning: %s" ++msgid "Writing: %s" ++msgstr "%s: ostrzeżenie: %s" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1094,6 +1313,10 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++msgid "append_line: %s is not a file" ++msgstr "" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1138,7 +1361,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + msgid "cannot parse --mac ip prefix length field as an integer: %s" + msgstr "" + +@@ -1171,11 +1394,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "" + +@@ -1183,13 +1406,13 @@ msgstr "" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1220,8 +1443,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1229,7 +1452,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1250,7 +1473,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1274,7 +1497,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1326,7 +1549,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1346,7 +1569,7 @@ msgstr "" + msgid "exited with error %d" + msgstr "" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1364,11 +1587,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1376,15 +1599,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1406,7 +1629,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1421,14 +1644,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1445,7 +1679,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1468,7 +1702,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1517,13 +1751,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1535,7 +1769,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1551,10 +1785,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1581,6 +1831,12 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++#, fuzzy ++#| msgid "%s (ignored)" ++msgid "log file %s: %s (ignored)" ++msgstr "%s (zignorowane)" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1591,7 +1847,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "" + +@@ -1599,7 +1855,7 @@ msgstr "" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1615,7 +1871,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1643,11 +1905,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1690,7 +1952,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1702,7 +1964,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1739,7 +2001,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1755,7 +2017,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1763,11 +2025,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1794,7 +2056,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1842,22 +2104,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1875,19 +2154,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1933,13 +2217,33 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++msgid "ssh-inject: no public key file found in %s" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + msgid "stopped by signal %d" + msgstr "" +@@ -1952,11 +2256,15 @@ msgstr "" + msgid "subprocess signalled or stopped by signal %d" + msgstr "" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1966,15 +2274,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1987,7 +2301,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2044,7 +2358,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2052,7 +2366,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2060,7 +2374,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2090,7 +2404,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2102,23 +2424,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "nieznana opcja --root: %s" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "nieznana opcja -i: %s" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "nieznana opcja -o: %s" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "nieznana opcja -oa: %s" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2126,11 +2448,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2138,11 +2460,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2150,7 +2472,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2224,7 +2546,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2266,7 +2588,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/si.po b/po/si.po +index 62d45590..b8dceb23 100644 +--- a/po/si.po ++++ b/po/si.po +@@ -8,7 +8,7 @@ msgstr "" + "Project-Id-Version: virt-v2v 1.43.3\n" + "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?" + "component=libguestfs&product=Virtualization+Tools\n" +-"POT-Creation-Date: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: Automatically generated\n" + "Language-Team: none\n" +@@ -28,7 +28,7 @@ msgid "" + "Options:\n" + msgstr "" + +-#: common/mltools/tools_utils.ml:695 ++#: common/mltools/tools_utils.ml:695 common/mlcustomize/customize_run.ml:435 + msgid "%s (ignored)" + msgstr "" + +@@ -36,6 +36,10 @@ msgstr "" + msgid "%s did not return any output" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:191 ++msgid "%s does not exist in the guest" ++msgstr "" ++ + #: output/output_rhv.ml:273 + msgid "" + "%s does not exist or is not a directory.\n" +@@ -50,11 +54,19 @@ msgid "" + "this out through the RHV-M user interface." + msgstr "" + +-#. inspector/inspector.ml:149 ++#: common/mlcustomize/customize_run.ml:121 ++msgid "%s ignored for non-Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:194 ++msgid "%s is not a regular file in the guest" ++msgstr "" ++ ++#. inspector/inspector.ml:151 + #. inspector/inspector.ml:40 +-#. in-place/in_place.ml:146 ++#. in-place/in_place.ml:148 + #. in-place/in_place.ml:39 +-#: v2v/v2v.ml:196 v2v/v2v.ml:182 v2v/v2v.ml:162 v2v/v2v.ml:44 ++#: v2v/v2v.ml:198 v2v/v2v.ml:184 v2v/v2v.ml:164 v2v/v2v.ml:44 + msgid "%s option used more than once on the command line" + msgstr "" + +@@ -72,11 +84,15 @@ msgid "" + "%!" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:401 ++#: common/mlcustomize/inject_virtio_win.ml:434 + msgid "%s: cannot open virtio-win ISO file: %s" + msgstr "" + +-#: v2v/v2v.ml:316 ++#: common/mlcustomize/customize_run.ml:72 ++msgid "%s: command exited with an error" ++msgstr "" ++ ++#: v2v/v2v.ml:326 + msgid "" + "%s: convert a guest to use KVM\n" + "\n" +@@ -99,7 +115,7 @@ msgid "" + "read the man page virt-v2v(1).\n" + msgstr "" + +-#: in-place/in_place.ml:184 ++#: in-place/in_place.ml:194 + msgid "" + "%s: convert a guest to use KVM in-place\n" + "\n" +@@ -118,7 +134,7 @@ msgstr "" + msgid "%s: error: %s" + msgstr "" + +-#: inspector/inspector.ml:187 ++#: inspector/inspector.ml:197 + msgid "" + "%s: estimate disk space needed before virt-v2v conversion\n" + "\n" +@@ -144,12 +160,39 @@ msgstr "" + msgid "%s: warning: %s" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:268 +-#: common/mlcustomize/customize_cmdline.ml:371 ++#. common/mlcustomize/customize_cmdline.ml:270 ++#: common/mlcustomize/customize_cmdline.ml:379 + msgid "'CMD+ARGS'" + msgstr "" + +-#: v2v/v2v.ml:142 inspector/inspector.ml:129 in-place/in_place.ml:123 ++#: common/mlcustomize/customize_run.ml:141 ++msgid "" ++"--append-line: line must not contain newline characters. Use the --append-" ++"line option multiple times to add several lines." ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:160 ++msgid "--chown: could not parse numeric UID:GID from %s:%s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:224 ++msgid "" ++"--inject-blnsvr: blnsvr.exe not found in virtio-win source that you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:233 ++msgid "" ++"--inject-qemu-ga: QEMU Guest Agent MSI not found in virtio-win source that " ++"you specified" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:249 ++msgid "" ++"--inject-virtio-win: virtio drivers were not found for this Windows version " ++"in the virtio-win source that you specified" ++msgstr "" ++ ++#: v2v/v2v.ml:144 inspector/inspector.ml:131 in-place/in_place.ml:125 + msgid "--mac ip prefix length field is out of range" + msgstr "" + +@@ -197,16 +240,16 @@ msgstr "" + msgid "-i ova: expecting an OVA file name on the command line" + msgstr "" + +-#: input/OVA.ml:356 ++#: input/OVA.ml:361 + msgid "" + "-i ova: invalid OVA file: path ‘%s’ references a file outside the archive" + msgstr "" + +-#: input/input_vmx.ml:53 ++#: input/input_vmx.ml:57 + msgid "-i vmx: cannot use -it vddk in this input mode" + msgstr "" + +-#: input/input_vmx.ml:56 ++#: input/input_vmx.ml:60 + msgid "-i vmx: expecting a VMX file or ssh:// URI" + msgstr "" + +@@ -348,7 +391,7 @@ msgstr "" + msgid "-o vdsm: unknown vdsm-compat level ‘%s’" + msgstr "" + +-#: output/output.ml:100 ++#: output/output.ml:99 + msgid "-oo compressed option requires nbdcopy >= 1.13.5" + msgstr "" + +@@ -390,82 +433,114 @@ msgid "" + "3.7." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++msgid "Appending line to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++msgid "Attaching to compatible subscriptions" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:297 ++msgid "Attaching to the pool %s" ++msgstr "" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++msgid "Changing permissions of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + msgid "Copy local files or directories from a tarball into image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++msgid "Copying (in image): %s to %s" ++msgstr "" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++msgid "Copying: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:184 ++msgid "Deleting: %s" ++msgstr "" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "" +@@ -474,7 +549,7 @@ msgstr "" + msgid "Display version and exit" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "" + +@@ -486,10 +561,14 @@ msgstr "" + msgid "Don’t turn off echo for passphrases" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "" +@@ -502,41 +581,41 @@ msgstr "" + msgid "Export Storage Domain" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "" + +@@ -548,23 +627,27 @@ msgid "" + " %s -v -x [...]" + msgstr "" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "" + +@@ -591,20 +674,41 @@ msgid "" + "information on these settings.\n" + msgstr "" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++msgid "Installing packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "" + +@@ -612,26 +716,34 @@ msgstr "" + msgid "Make output machine readable" + msgstr "" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -645,14 +757,14 @@ msgstr "" + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 "" + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "" + +@@ -720,26 +832,26 @@ msgid "" + " -oo compressed Compress the output file (used only with -of qcow2)\n" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "" + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "" + +@@ -747,7 +859,7 @@ msgstr "" + msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "" + +@@ -755,164 +867,205 @@ msgstr "" + msgid "Read passphrases from stdin" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++msgid "Recursively truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++msgid "Registering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++msgid "Removing all the subscriptions" ++msgstr "" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++msgid "Running: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "" + +-#: v2v/v2v.ml:283 +-msgid "Same as ‘-io vddk-config=filename’" ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" + msgstr "" + + #: v2v/v2v.ml:285 +-msgid "Same as ‘-io vddk-cookie=filename’" ++msgid "Same as ‘-io vddk-config=filename’" + msgstr "" + + #: v2v/v2v.ml:287 +-msgid "Same as ‘-io vddk-libdir=libdir’" ++msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "" + + #: v2v/v2v.ml:289 +-msgid "Same as ‘-io vddk-nfchostport=nfchostport’" ++msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "" + + #: v2v/v2v.ml:291 +-msgid "Same as ‘-io vddk-port=port’" ++msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "" + + #: v2v/v2v.ml:293 +-msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" ++msgid "Same as ‘-io vddk-port=port’" + msgstr "" + + #: v2v/v2v.ml:295 +-msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "" + + #: v2v/v2v.ml:297 ++msgid "Same as ‘-io vddk-thumbprint=thumbprint’" ++msgstr "" ++ ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "" + +-#: v2v/v2v.ml:299 +-msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" +-msgstr "" +- + #: v2v/v2v.ml:301 ++msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" ++msgstr "" ++ ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++msgid "Scrubbing the log file" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "" + +@@ -920,35 +1073,59 @@ msgstr "" + msgid "Set program name" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++msgid "Setting passwords" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++msgid "Setting the hostname: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:98 ++msgid "Setting the machine ID in %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:347 ++msgid "Setting the timezone: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "" + +@@ -956,30 +1133,30 @@ msgstr "" + msgid "Specify a LUKS key" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + msgid "TARFILE:REMOTEDIR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." + msgstr "" + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -992,7 +1169,7 @@ msgid "" + "require a separate password to connect." + msgstr "" + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1000,51 +1177,75 @@ msgid "" + "\"NOTES\"." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++msgid "Truncating: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++msgid "Uninstalling packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++msgid "Unregistering with subscription-manager" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++msgid "Updating packages" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:366 ++msgid "Uploading: %s to %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "" + +@@ -1052,10 +1253,14 @@ msgstr "" + msgid "Wrap log messages even if not tty" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:391 ++msgid "Writing: %s" ++msgstr "" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1081,6 +1286,10 @@ msgid "" + "delete the existing domain on the target using the ‘virsh undefine’ command." + msgstr "" + ++#: common/mlcustomize/append_line.ml:44 ++msgid "append_line: %s is not a file" ++msgstr "" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1125,7 +1334,7 @@ msgstr "" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + msgid "cannot parse --mac ip prefix length field as an integer: %s" + msgstr "" + +@@ -1158,11 +1367,11 @@ msgid "" + "v2v (^C) and rerun it as root." + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "" + +@@ -1170,13 +1379,13 @@ msgstr "" + msgid "could not add grub2 serial console (ignored)" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" + msgstr "" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1207,8 +1416,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + +@@ -1216,7 +1425,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "" + +@@ -1237,7 +1446,7 @@ msgid "" + "harmless. Original error message: %s" + msgstr "" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "" + +@@ -1261,7 +1470,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "" + +@@ -1313,7 +1522,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "" + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "" + +@@ -1333,7 +1542,7 @@ msgstr "" + msgid "exited with error %d" + msgstr "" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "" + +@@ -1351,11 +1560,11 @@ msgstr "" + msgid "failed server prechecks, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + +@@ -1363,15 +1572,15 @@ msgstr "" + msgid "failed to find grub2-mkconfig binary (but Grub2 was detected on guest)" + msgstr "" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + +@@ -1393,7 +1602,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +@@ -1408,14 +1617,25 @@ msgstr "" + msgid "glance: image upload to glance failed, see earlier errors" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "" +@@ -1432,7 +1652,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "" + +@@ -1455,7 +1675,7 @@ msgid "" + "block devices\"." + msgstr "" + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1504,13 +1724,13 @@ msgstr "" + msgid "invalid -n/--network parameter" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "" + +@@ -1522,7 +1742,7 @@ msgstr "" + msgid "invalid input filename (%s)" + msgstr "" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "" + +@@ -1538,10 +1758,26 @@ msgstr "" + msgid "invalid output stream for --machine-readable: %s" + msgstr "" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "" + ++#: common/mlcustomize/subscription_manager.ml:54 ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "" +@@ -1568,6 +1804,10 @@ msgid "" + "perform virt-v2v conversion" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:47 ++msgid "log file %s: %s (ignored)" ++msgstr "" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1578,7 +1818,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "" + +@@ -1586,7 +1826,7 @@ msgstr "" + msgid "missing value for the key ‘%s’" + msgstr "" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "" + +@@ -1602,7 +1842,13 @@ msgid "" + "you need to rerun virt-v2v as root." + msgstr "" + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + +@@ -1630,11 +1876,11 @@ msgid "" + "See also the virt-v2v-input-vmware(1) manual." + msgstr "" + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -1677,7 +1923,7 @@ msgstr "" + msgid "nbdkit is not new enough, you need to upgrade to nbdkit ≥ %s" + msgstr "" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "" + +@@ -1689,7 +1935,7 @@ msgid "" + "See also the virt-v2v-output-rhv(1) manual." + msgstr "" + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -1726,7 +1972,7 @@ msgstr "" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "" + +@@ -1742,7 +1988,7 @@ msgstr "" + msgid "no -oo (output options) are allowed here" + msgstr "" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "" + +@@ -1750,11 +1996,11 @@ msgstr "" + msgid "no bootloader detected" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "" + +@@ -1781,7 +2027,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -1829,22 +2075,39 @@ msgid "" + "\"available\"" + msgstr "" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" + msgstr "" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" + msgstr "" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -1862,19 +2125,24 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " + "adding either ‘-of raw’ or ‘-of qcow2’ on the command line." + msgstr "" + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -1920,13 +2188,33 @@ msgid "" + "options instead (described in the virt-customize(1) manual)." + msgstr "" + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " + "man page for more information." + msgstr "" + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++msgid "ssh-inject: no public key file found in %s" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + msgid "stopped by signal %d" + msgstr "" +@@ -1939,11 +2227,15 @@ msgstr "" + msgid "subprocess signalled or stopped by signal %d" + msgstr "" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "" + +@@ -1953,15 +2245,21 @@ msgid "" + "previous messages for problems." + msgstr "" + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -1974,7 +2272,7 @@ msgid "" + "this guest: %d)" + msgstr "" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + +@@ -2031,7 +2329,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2039,7 +2337,7 @@ msgid "" + "The guest will be configured to use slower emulated devices." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2047,7 +2345,7 @@ msgid "" + "The guest will be configured to use a slower emulated device." + msgstr "" + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2075,7 +2373,15 @@ msgstr "" + msgid "this output module doesn't support copying more than %d disks" + msgstr "" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "" + +@@ -2087,23 +2393,23 @@ msgstr "" + msgid "unhandled checksum type ‘%s’" + msgstr "" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "" + +@@ -2111,11 +2417,11 @@ msgstr "" + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "" + +@@ -2123,11 +2429,11 @@ msgstr "" + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "" + +@@ -2135,7 +2441,7 @@ msgstr "" + msgid "unknown sound model %s ignored" + msgstr "" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "" + +@@ -2209,7 +2515,7 @@ msgid "" + "input libvirt XML was ignored" + msgstr "" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "" + +@@ -2251,7 +2557,7 @@ msgid "" + "vmware(1) manual." + msgstr "" + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +diff --git a/po/uk.po b/po/uk.po +index 5a802677..047434a7 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -14,7 +14,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: 2024-01-04 17:06+0000\n" ++"POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2023-06-05 07:20+0000\n" + "Last-Translator: Yuri Chornoivan \n" + "Language-Team: Ukrainian = 1.13.5" + msgstr "використання параметра -oo compressed потребує nbdcopy >= 1.13.5" + +@@ -499,84 +546,130 @@ msgstr "" + "Найімовірнішою причиною є те, що встановлена версія libvirt є застарілою. " + "Спробуйте оновити libvirt до ≥ 3.7." + +-#: common/mlcustomize/customize_cmdline.ml:309 ++#: common/mlcustomize/customize_cmdline.ml:317 + msgid "Add package(s) to install" + msgstr "Додати пакунки для встановлення" + +-#: common/mlcustomize/customize_cmdline.ml:280 ++#: common/mlcustomize/customize_cmdline.ml:282 + msgid "Add package(s) to install at first boot" + msgstr "Додати пакунки для встановлення під час першого завантаження" + +-#: common/mlcustomize/customize_cmdline.ml:185 ++#: common/mlcustomize/customize_cmdline.ml:187 + msgid "Append line(s) to the file" + msgstr "Дописати рядки до файла" + +-#: common/mlcustomize/customize_cmdline.ml:389 ++#: common/mlcustomize/customize_run.ml:145 ++#, fuzzy ++#| msgid "Append line(s) to the file" ++msgid "Appending line to %s" ++msgstr "Дописати рядки до файла" ++ ++#: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "Долучити до буфера subscription-manager" + +-#: v2v/v2v.ml:279 ++#: common/mlcustomize/customize_run.ml:293 ++#, fuzzy ++#| msgid "Attach to a subscription-manager pool" ++msgid "Attaching to compatible subscriptions" ++msgstr "Долучити до буфера subscription-manager" ++ ++#: common/mlcustomize/customize_run.ml:297 ++#, fuzzy ++#| msgid "Setting up the source: %s" ++msgid "Attaching to the pool %s" ++msgstr "Налаштовуємо джерело: %s" ++ ++#: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" + msgstr "Завантажитися у qemu (лише для -o qemu)" + +-#: common/mlcustomize/customize_cmdline.ml:207 ++#: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:196 ++#: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" + msgstr "Змінити права доступу до файла" + +-#: common/mlcustomize/customize_cmdline.ml:521 ++#: common/mlcustomize/customize_run.ml:163 ++msgid "Changing owner of %s to %d:%d" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:149 ++#, fuzzy ++#| msgid "Change the permissions of a file" ++msgid "Changing permissions of %s to %s" ++msgstr "Змінити права доступу до файла" ++ ++#: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" + msgstr "Параметр сумісності ні на що не впливає" + +-#: v2v/v2v.ml:237 ++#: v2v/v2v.ml:239 + msgid "Compress output file (-of qcow2 only)" + msgstr "Стиснути файл виведення (лише для -of qcow2)" + +-#: common/mlcustomize/customize_cmdline.ml:229 ++#: common/mlcustomize/customize_cmdline.ml:231 + msgid "Copy files in disk image" + msgstr "Копіювати файли на образ диска" + +-#: common/mlcustomize/customize_cmdline.ml:430 ++#: common/mlcustomize/customize_cmdline.ml:438 + #, fuzzy + #| msgid "Copy local files or directories into image" + msgid "Copy local files or directories from a tarball into image" + msgstr "Копіювати локальні файли або каталоги до образу" + +-#: common/mlcustomize/customize_cmdline.ml:240 ++#: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" + msgstr "Копіювати локальні файли або каталоги до образу" + +-#: v2v/v2v.ml:602 ++#: common/mlcustomize/customize_run.ml:176 ++#, fuzzy ++#| msgid "Copying remote disk %d/%d to %s" ++msgid "Copying (in image): %s to %s" ++msgstr "Копіюємо віддалений диск %d з %d до %s" ++ ++#: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "Копіювання диска %d з %d" + +-#: common/mlcustomize/customize_cmdline.ml:326 ++#: common/mlcustomize/customize_run.ml:180 ++#, fuzzy ++#| msgid "Copying disk %d/%d to %s (%s)" ++msgid "Copying: %s to %s" ++msgstr "Копіювання диска %d з %d на %s (%s)" ++ ++#: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" + msgstr "Створити каталог" + +-#: common/mlcustomize/customize_cmdline.ml:320 ++#: common/mlcustomize/customize_cmdline.ml:328 + msgid "Create symbolic links" + msgstr "Створювати символічні посилання" + +-#: v2v/v2v.ml:623 ++#: v2v/v2v.ml:642 + msgid "Creating output metadata" + msgstr "Створюємо метадані результатів" + +-#: common/mlcustomize/customize_cmdline.ml:531 ++#: common/mlcustomize/customize_cmdline.ml:539 + msgid "Credentials for subscription-manager" + msgstr "Реєстраційні дані для subscription-manager" + +-#: common/mlcustomize/customize_cmdline.ml:325 ++#: common/mlcustomize/customize_cmdline.ml:333 + msgid "DIR" + msgstr "КАТАЛОГ" + +-#: common/mlcustomize/customize_cmdline.ml:246 ++#: common/mlcustomize/customize_cmdline.ml:248 + msgid "Delete a file or directory" + msgstr "Вилучити файл або каталог" + ++#: common/mlcustomize/customize_run.ml:184 ++#, fuzzy ++#| msgid "exception: %s" ++msgid "Deleting: %s" ++msgstr "виключення: %s" ++ + #: common/mltools/getopt.ml:229 + msgid "Display brief help" + msgstr "Показати коротку довідку" +@@ -585,7 +678,7 @@ msgstr "Показати коротку довідку" + msgid "Display version and exit" + msgstr "Вивести версію та вийти" + +-#: common/mlcustomize/customize_cmdline.ml:515 ++#: common/mlcustomize/customize_cmdline.ml:523 + msgid "Do not relabel files with correct SELinux labels" + msgstr "Не змінити мітки файлів на коректні мітки SELinux" + +@@ -597,10 +690,14 @@ msgstr "Не виводити повідомлень щодо поступу" + msgid "Don’t turn off echo for passphrases" + msgstr "Не вимикати луна-повторення у паролях" + +-#: common/mlcustomize/customize_cmdline.ml:257 ++#: common/mlcustomize/customize_cmdline.ml:259 + msgid "Edit file using Perl expression" + msgstr "Редагувати файл за допомогою виразу Perl" + ++#: common/mlcustomize/customize_run.ml:188 ++msgid "Editing: %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" + msgstr "Увімкнути діагностичні повідомлення libguestfs" +@@ -613,41 +710,41 @@ msgstr "Увімкнути трасування викликів libguestfs" + msgid "Export Storage Domain" + msgstr "Експортувати домен сховища" + +-#. common/mlcustomize/customize_cmdline.ml:441 +-#. common/mlcustomize/customize_cmdline.ml:377 +-#: common/mlcustomize/customize_cmdline.ml:447 ++#. common/mlcustomize/customize_cmdline.ml:449 ++#. common/mlcustomize/customize_cmdline.ml:385 ++#: common/mlcustomize/customize_cmdline.ml:455 + msgid "FILE" + msgstr "ФАЙЛ" + +-#: common/mlcustomize/customize_cmdline.ml:488 ++#: common/mlcustomize/customize_cmdline.ml:496 + msgid "FILE:CONTENT" + msgstr "ФАЙЛ:ВМІСТ" + +-#: common/mlcustomize/customize_cmdline.ml:477 ++#: common/mlcustomize/customize_cmdline.ml:485 + msgid "FILE:DEST" + msgstr "ФАЙЛ:ПРИЗНАЧЕННЯ" + +-#: common/mlcustomize/customize_cmdline.ml:252 ++#: common/mlcustomize/customize_cmdline.ml:254 + msgid "FILE:EXPR" + msgstr "ФАЙЛ:ВИРАЗ" + +-#: common/mlcustomize/customize_cmdline.ml:180 ++#: common/mlcustomize/customize_cmdline.ml:182 + msgid "FILE:LINE" + msgstr "ФАЙЛ:РЯДОК" + +-#: common/mlcustomize/customize_cmdline.ml:213 ++#: common/mlcustomize/customize_cmdline.ml:215 + msgid "FILENAME" + msgstr "НАЗВА_ФАЙЛА" + +-#: v2v/v2v.ml:627 inspector/inspector.ml:365 in-place/in_place.ml:354 ++#: v2v/v2v.ml:646 inspector/inspector.ml:379 in-place/in_place.ml:368 + msgid "Finishing off" + msgstr "Завершуємо" + +-#: common/mlcustomize/customize_cmdline.ml:285 ++#: common/mlcustomize/customize_cmdline.ml:287 + msgid "HOSTNAME" + msgstr "НАЗВА_ВУЗЛА" + +-#: v2v/v2v.ml:281 inspector/inspector.ml:180 in-place/in_place.ml:179 ++#: v2v/v2v.ml:283 inspector/inspector.ml:182 in-place/in_place.ml:181 + msgid "How to choose root filesystem" + msgstr "Як вибрати кореневу файлову систему" + +@@ -663,23 +760,29 @@ msgstr "" + "\n" + " %s -v -x [...]" + +-#: v2v/v2v.ml:311 v2v/v2v.ml:257 ++#: v2v/v2v.ml:313 v2v/v2v.ml:259 + msgid "Ignored for backwards compatibility" + msgstr "Ігноровано, для зворотної сумісності" + +-#: common/mlcustomize/customize_cmdline.ml:419 ++#: common/mlcustomize/customize_cmdline.ml:427 + msgid "Inject a public key into the guest" + msgstr "Вставити відкритий ключ до гостьової системи" + +-#: common/mlcustomize/customize_cmdline.ml:292 ++#: common/mlcustomize/customize_cmdline.ml:294 ++#, fuzzy ++#| msgid "Inject virtio-win drivers into a Windows guest" ++msgid "Inject the Balloon Server into a Windows guest" ++msgstr "Вставити драйвери virtio-win до гостьової системи Windows" ++ ++#: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" + msgstr "Вставити агент гостьової системи QEMU до гостьової системи Windows" + +-#: common/mlcustomize/customize_cmdline.ml:298 ++#: common/mlcustomize/customize_cmdline.ml:306 + msgid "Inject virtio-win drivers into a Windows guest" + msgstr "Вставити драйвери virtio-win до гостьової системи Windows" + +-#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 ++#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 + msgid "Input format" + msgstr "Формат вхідних даних" + +@@ -727,20 +830,43 @@ msgstr "" + "більше\n" + "про ці параметри.\n" + +-#: v2v/v2v.ml:249 inspector/inspector.ml:174 ++#: v2v/v2v.ml:251 inspector/inspector.ml:176 + msgid "Input transport" + msgstr "Вхідне передавання" + +-#: common/mlcustomize/customize_cmdline.ml:235 ++#: common/mlcustomize/customize_run.ml:199 ++msgid "Installing firstboot command: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:203 ++msgid "Installing firstboot packages: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:210 ++msgid "Installing firstboot script: %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:256 ++#, fuzzy ++#| msgid "Uninstall package(s)" ++msgid "Installing packages: %s" ++msgstr "Вилучити пакунки" ++ ++#: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" + msgstr "ЛОКАЛЬНИЙШЛЯХ:ВІДДАЛЕНИЙКАТАЛОГ" + +-#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 ++#: v2v/v2v.ml:243 inspector/inspector.ml:168 in-place/in_place.ml:167 + msgid "Libvirt URI" + msgstr "Адреса libvirt" + +-#. common/mlcustomize/customize_cmdline.ml:291 +-#: common/mlcustomize/customize_cmdline.ml:297 ++#: common/mlcustomize/customize_run.ml:263 ++msgid "Linking: %s -> %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:299 ++#. common/mlcustomize/customize_cmdline.ml:293 ++#: common/mlcustomize/customize_cmdline.ml:305 + msgid "METHOD" + msgstr "МЕТОД" + +@@ -748,27 +874,35 @@ msgstr "МЕТОД" + msgid "Make output machine readable" + msgstr "Зробити машину виведення придатною до читання" + +-#: v2v/v2v.ml:253 inspector/inspector.ml:176 in-place/in_place.ml:173 ++#: common/mlcustomize/customize_run.ml:268 ++msgid "Making directory: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" + msgstr "" + "Пов'язати NIC із мережею або містком чи пов'язати із ним статичну IP-адресу" + +-#: v2v/v2v.ml:233 inspector/inspector.ml:162 in-place/in_place.ml:159 ++#: v2v/v2v.ml:235 inspector/inspector.ml:164 in-place/in_place.ml:161 + msgid "Map bridge ‘in’ to ‘out’" + msgstr "Відобразити місток «in» на «out»" + +-#: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 ++#: v2v/v2v.ml:257 inspector/inspector.ml:180 in-place/in_place.ml:177 + msgid "Map network ‘in’ to ‘out’" + msgstr "Пов'язати мережу «in» із мережею «out»" + +-#: common/mlcustomize/customize_cmdline.ml:337 ++#: common/mlcustomize/customize_cmdline.ml:345 + msgid "Move files in disk image" + msgstr "Пересунути файли на образ диска" + ++#: common/mlcustomize/customize_run.ml:272 ++msgid "Moving: %s -> %s" ++msgstr "" ++ + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +-#. input/input_libvirt.ml:162 +-#. input/input_libvirt.ml:150 ++#. input/input_libvirt.ml:160 ++#. input/input_libvirt.ml:148 + #. input/input_disk.ml:36 + #: input/input_xen_ssh.ml:43 input/input_vmx.ml:36 + msgid "No input options can be used in this mode.\n" +@@ -782,7 +916,7 @@ msgstr "У цьому режимі не можна використовуват + msgid "OVF (metadata) directory (%s) does not exist or is not a directory" + msgstr "Каталогу OVF (метаданих) (%s) не існує або це не каталог" + +-#: common/mlcustomize/firstboot.ml:254 ++#: common/mlcustomize/firstboot.ml:269 + 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 " +@@ -793,7 +927,7 @@ msgstr "" + "Windows. Отримати цей файл можна зібравши rhsrvany (https://github.com/" + "rwmjones/rhsrvany)." + +-#: v2v/v2v.ml:263 ++#: v2v/v2v.ml:265 + msgid "Output hypervisor connection" + msgstr "Вивести з'єднання гіпервізора" + +@@ -909,26 +1043,26 @@ msgstr "" + " -oo compressed стиснути файл виведення (можна використовувати лише з -" + "of qcow2)\n" + +-#. common/mlcustomize/customize_cmdline.ml:245 +-#: common/mlcustomize/customize_cmdline.ml:453 ++#. common/mlcustomize/customize_cmdline.ml:247 ++#: common/mlcustomize/customize_cmdline.ml:461 + msgid "PATH" + msgstr "ШЛЯХ" + +-#: common/mlcustomize/customize_cmdline.ml:191 ++#: common/mlcustomize/customize_cmdline.ml:193 + msgid "PERMISSIONS:FILE" + msgstr "ПРАВА_ДОСТУПУ:ФАЙЛ" + +-#. common/mlcustomize/customize_cmdline.ml:304 +-#. common/mlcustomize/customize_cmdline.ml:275 +-#: common/mlcustomize/customize_cmdline.ml:460 ++#. common/mlcustomize/customize_cmdline.ml:312 ++#. common/mlcustomize/customize_cmdline.ml:277 ++#: common/mlcustomize/customize_cmdline.ml:468 + msgid "PKG,PKG.." + msgstr "ПАКУНОК,ПАКУНОК.." + +-#: v2v/v2v.ml:235 in-place/in_place.ml:161 ++#: v2v/v2v.ml:237 in-place/in_place.ml:163 + msgid "Prefer 'virtio-blk' or 'virtio-scsi'" + msgstr "Перевага «virtio-blk» або «virtio-scsi»" + +-#: v2v/v2v.ml:277 in-place/in_place.ml:177 ++#: v2v/v2v.ml:279 in-place/in_place.ml:179 + msgid "Print source and stop" + msgstr "Вивести джерело і припинити обробку" + +@@ -937,7 +1071,7 @@ msgid "RHV does not support the output format ‘%s’, only raw or qcow2" + msgstr "" + "У RHV не передбачено формату виведення даних «‘%s», лише формати raw та qcow2" + +-#: common/mlcustomize/customize_cmdline.ml:218 ++#: common/mlcustomize/customize_cmdline.ml:220 + msgid "Read customize commands from file" + msgstr "Прочитати команди налаштовування з файла" + +@@ -945,164 +1079,215 @@ msgstr "Прочитати команди налаштовування з фай + msgid "Read passphrases from stdin" + msgstr "Читати паролі зі стандартного введення (stdin)" + +-#: common/mlcustomize/customize_cmdline.ml:454 ++#: common/mlcustomize/customize_cmdline.ml:462 + msgid "Recursively truncate all files in directory" + msgstr "Рекурсивно обрізати усі файли у каталозі" + +-#: common/mlcustomize/customize_cmdline.ml:395 ++#: common/mlcustomize/customize_run.ml:343 ++#, fuzzy ++#| msgid "Recursively truncate all files in directory" ++msgid "Recursively truncating: %s" ++msgstr "Рекурсивно обрізати усі файли у каталозі" ++ ++#: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "Зареєструвати за допомогою subscription-manager" + +-#: common/mlcustomize/customize_cmdline.ml:401 ++#: common/mlcustomize/customize_run.ml:303 ++#, fuzzy ++#| msgid "Register using subscription-manager" ++msgid "Registering with subscription-manager" ++msgstr "Зареєструвати за допомогою subscription-manager" ++ ++#: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "Вилучити усі підписки" + +-#: v2v/v2v.ml:267 ++#: common/mlcustomize/customize_run.ml:318 ++#, fuzzy ++#| msgid "Remove all the subscriptions" ++msgid "Removing all the subscriptions" ++msgstr "Вилучити усі підписки" ++ ++#: v2v/v2v.ml:269 + msgid "Rename guest when converting" + msgstr "Перейменувати гостьову систему під час перетворення" + +-#: common/mlcustomize/customize_cmdline.ml:269 ++#: common/mlcustomize/customize_cmdline.ml:271 + msgid "Run command at first guest boot" + msgstr "Виконати команду під час першого завантаження гостьової системи" + +-#: common/mlcustomize/customize_cmdline.ml:372 ++#: common/mlcustomize/customize_cmdline.ml:380 + msgid "Run command in disk image" + msgstr "Виконати команду у образі диска" + +-#: common/mlcustomize/customize_cmdline.ml:263 ++#: common/mlcustomize/customize_cmdline.ml:265 + msgid "Run script at first guest boot" + msgstr "Виконати скрипт під час першого завантаження гостьової системи" + +-#: common/mlcustomize/customize_cmdline.ml:366 ++#: common/mlcustomize/customize_cmdline.ml:374 + msgid "Run script in disk image" + msgstr "Виконати скрипт у образі диска" + +-#: common/mlcustomize/customize_cmdline.ml:442 ++#: common/mlcustomize/customize_cmdline.ml:450 + msgid "Run touch on a file" + msgstr "Обробити файл за допомогою touch" + +-#. common/mlcustomize/customize_cmdline.ml:262 +-#: common/mlcustomize/customize_cmdline.ml:365 ++#: common/mlcustomize/customize_run.ml:352 ++msgid "Running touch: %s" ++msgstr "" ++ ++#. common/mlcustomize/customize_run.ml:167 ++#: common/mlcustomize/customize_run.ml:282 ++#, fuzzy ++#| msgid "%s: warning: %s" ++msgid "Running: %s" ++msgstr "%s: попередження: %s" ++ ++#. common/mlcustomize/customize_cmdline.ml:264 ++#: common/mlcustomize/customize_cmdline.ml:373 + msgid "SCRIPT" + msgstr "СКРИПТ" + +-#. common/mlcustomize/customize_cmdline.ml:384 +-#. common/mlcustomize/customize_cmdline.ml:355 ++#. common/mlcustomize/customize_cmdline.ml:392 ++#. common/mlcustomize/customize_cmdline.ml:363 + #: common/mltools/tools_utils.ml:422 +-#: common/mlcustomize/customize_cmdline.ml:527 ++#: common/mlcustomize/customize_cmdline.ml:535 + msgid "SELECTOR" + msgstr "СЕЛЕКТОР" + +-#. common/mlcustomize/customize_cmdline.ml:224 +-#: common/mlcustomize/customize_cmdline.ml:332 ++#: common/mlcustomize/customize_run.ml:408 ++msgid "SELinux relabelling" ++msgstr "" ++ ++#. common/mlcustomize/customize_cmdline.ml:226 ++#: common/mlcustomize/customize_cmdline.ml:340 + msgid "SOURCE:DEST" + msgstr "ДЖЕРЕЛО:ПРИЗНАЧЕННЯ" + +-#: v2v/v2v.ml:283 ++#: common/mlcustomize/customize_run.ml:332 ++msgid "SSH key could not be injected for this type of guest" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:329 ++msgid "SSH key inject: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:285 + msgid "Same as ‘-io vddk-config=filename’" + msgstr "Те саме, що і «-io vddk-config=назва_файла»" + +-#: v2v/v2v.ml:285 ++#: v2v/v2v.ml:287 + msgid "Same as ‘-io vddk-cookie=filename’" + msgstr "Те саме, що і «-io vddk-cookie=назва_файла»" + +-#: v2v/v2v.ml:287 ++#: v2v/v2v.ml:289 + msgid "Same as ‘-io vddk-libdir=libdir’" + msgstr "Те саме, що і «-io vddk-libdir=каталог_бібліотек»" + +-#: v2v/v2v.ml:289 ++#: v2v/v2v.ml:291 + msgid "Same as ‘-io vddk-nfchostport=nfchostport’" + msgstr "Те саме, що і «-io vddk-nfchostport=nfchostport»" + +-#: v2v/v2v.ml:291 ++#: v2v/v2v.ml:293 + msgid "Same as ‘-io vddk-port=port’" + msgstr "Те саме, що і «-io vddk-port=порт»" + +-#: v2v/v2v.ml:293 ++#: v2v/v2v.ml:295 + msgid "Same as ‘-io vddk-snapshot=snapshot-moref’" + msgstr "Те саме, що і «-io vddk-snapshot=snapshot-moref»" + +-#: v2v/v2v.ml:295 ++#: v2v/v2v.ml:297 + msgid "Same as ‘-io vddk-thumbprint=thumbprint’" + msgstr "Те саме, що і «-io vddk-thumbprint=відбиток»" + +-#: v2v/v2v.ml:297 ++#: v2v/v2v.ml:299 + msgid "Same as ‘-io vddk-transports=transports’" + msgstr "Те саме, що і «-io vddk-transports=способи_передавання»" + +-#: v2v/v2v.ml:275 ++#: v2v/v2v.ml:277 + msgid "Same as ‘-ip filename’" + msgstr "Те саме, що і «-ip назва_файла»" + +-#: v2v/v2v.ml:299 ++#: v2v/v2v.ml:301 + msgid "Same as ‘-oo vdsm-compat=0.10|1.1’" + msgstr "Те саме, що і «-oo vdsm-compat=0.10|1.1»" + +-#: v2v/v2v.ml:301 ++#: v2v/v2v.ml:303 + msgid "Same as ‘-oo vdsm-image-uuid=uuid’" + msgstr "Те саме, що і «-oo vdsm-image-uuid=uuid»" + +-#: v2v/v2v.ml:309 ++#: v2v/v2v.ml:311 + msgid "Same as ‘-oo vdsm-ovf-flavour=flavour’" + msgstr "Те саме, що і «-oo vdsm-ovf-flavour=варіант»" + +-#: v2v/v2v.ml:307 ++#: v2v/v2v.ml:309 + msgid "Same as ‘-oo vdsm-ovf-output=dir’" + msgstr "Те саме, що і «-oo vdsm-ovf-output=каталог»" + +-#: v2v/v2v.ml:305 ++#: v2v/v2v.ml:307 + msgid "Same as ‘-oo vdsm-vm-uuid=uuid’" + msgstr "Те саме, що і «-oo vdsm-vm-uuid=uuid»" + +-#: v2v/v2v.ml:303 ++#: v2v/v2v.ml:305 + msgid "Same as ‘-oo vdsm-vol-uuid=uuid’" + msgstr "Те саме, що і «-oo vdsm-vol-uuid=uuid»" + +-#: common/mlcustomize/customize_cmdline.ml:378 ++#: common/mlcustomize/customize_cmdline.ml:386 + msgid "Scrub a file" + msgstr "Витерти файл" + +-#: common/mlcustomize/customize_cmdline.ml:499 ++#: common/mlcustomize/customize_cmdline.ml:507 + msgid "Scrub build log file" + msgstr "Витерти файл журналу збирання" + +-#: v2v/v2v.ml:231 ++#: common/mlcustomize/customize_run.ml:419 ++#, fuzzy ++#| msgid "Scrub build log file" ++msgid "Scrubbing the log file" ++msgstr "Витерти файл журналу збирання" ++ ++#: common/mlcustomize/customize_run.ml:287 ++msgid "Scrubbing: %s" ++msgstr "" ++ ++#: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" + msgstr "Встановити ширину каналу динамічно з файла" + +-#: v2v/v2v.ml:229 ++#: v2v/v2v.ml:231 + msgid "Set bandwidth to bits per sec" + msgstr "Встановити ширину каналу у бітах за секунду" + +-#: v2v/v2v.ml:239 inspector/inspector.ml:164 in-place/in_place.ml:163 ++#: v2v/v2v.ml:241 inspector/inspector.ml:166 in-place/in_place.ml:165 + msgid "Set input mode (default: libvirt)" + msgstr "Встановити режим введення даних (типовий: libvirt)" + +-#: v2v/v2v.ml:245 inspector/inspector.ml:170 in-place/in_place.ml:169 ++#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 + msgid "Set option for input mode" + msgstr "Встановити варіант для режиму вхідних даних" + +-#: v2v/v2v.ml:269 ++#: v2v/v2v.ml:271 + msgid "Set option for output mode" + msgstr "Встановити варіант для режиму виведення" + +-#: v2v/v2v.ml:261 ++#: v2v/v2v.ml:263 + msgid "Set output allocation mode" + msgstr "Встановити режим отримання пам’яті для виведення даних" + +-#: v2v/v2v.ml:265 ++#: v2v/v2v.ml:267 + msgid "Set output format" + msgstr "встановити формат виведення даних" + +-#: v2v/v2v.ml:259 ++#: v2v/v2v.ml:261 + msgid "Set output mode (default: libvirt)" + msgstr "Встановити режим виведення (типовий: libvirt)" + +-#: v2v/v2v.ml:273 ++#: v2v/v2v.ml:275 + msgid "Set output storage location" + msgstr "Встановити розташування сховища виведених даних" + +-#: common/mlcustomize/customize_cmdline.ml:509 ++#: common/mlcustomize/customize_cmdline.ml:517 + msgid "Set password crypto" + msgstr "Встановити алгоритм шифрування пароля" + +@@ -1110,35 +1295,67 @@ msgstr "Встановити алгоритм шифрування пароля" + msgid "Set program name" + msgstr "Встановити назву програми" + +-#: common/mlcustomize/customize_cmdline.ml:360 ++#: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" + msgstr "Встановлення пароля root" + +-#: common/mlcustomize/customize_cmdline.ml:436 ++#: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" + msgstr "Встановити типовий часовий пояс" + +-#: common/mlcustomize/customize_cmdline.ml:286 ++#: common/mlcustomize/customize_cmdline.ml:288 + msgid "Set the hostname" + msgstr "Встановити назву вузла" + +-#: inspector/inspector.ml:182 ++#: inspector/inspector.ml:184 + msgid "Set the output filename" + msgstr "Встановити назву файла результатів" + +-#: common/mlcustomize/customize_cmdline.ml:349 ++#: common/mlcustomize/customize_cmdline.ml:357 + msgid "Set user password" + msgstr "Встановити пароль користувача" + +-#: v2v/v2v.ml:574 ++#: common/mlcustomize/customize_run.ml:83 ++msgid "Setting a random seed" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:399 ++#, fuzzy ++#| msgid "Set root password" ++msgid "Setting passwords" ++msgstr "Встановлення пароля root" ++ ++#: common/mlcustomize/password.ml:113 ++msgid "Setting random password of %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:215 ++#, fuzzy ++#| msgid "Set the hostname" ++msgid "Setting the hostname: %s" ++msgstr "Встановити назву вузла" ++ ++#: common/mlcustomize/customize_run.ml:98 ++#, fuzzy ++#| msgid "Setting up the destination: %s" ++msgid "Setting the machine ID in %s" ++msgstr "Налаштовуємо призначення: %s" ++ ++#: common/mlcustomize/customize_run.ml:347 ++#, fuzzy ++#| msgid "Setting up the destination: %s" ++msgid "Setting the timezone: %s" ++msgstr "Налаштовуємо призначення: %s" ++ ++#: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" + msgstr "Налаштовуємо призначення: %s" + +-#: v2v/v2v.ml:550 inspector/inspector.ml:341 in-place/in_place.ml:320 ++#: v2v/v2v.ml:564 inspector/inspector.ml:355 in-place/in_place.ml:334 + msgid "Setting up the source: %s" + msgstr "Налаштовуємо джерело: %s" + +-#: v2v/v2v.ml:556 in-place/in_place.ml:326 ++#: v2v/v2v.ml:570 in-place/in_place.ml:340 + msgid "Source guest information (--print-source option):\n" + msgstr "Дані щодо гостьової системи джерела (параметр --print-source):\n" + +@@ -1146,26 +1363,26 @@ msgstr "Дані щодо гостьової системи джерела (па + msgid "Specify a LUKS key" + msgstr "Вказати ключ LUKS" + +-#: common/mlcustomize/customize_cmdline.ml:425 ++#: common/mlcustomize/customize_cmdline.ml:433 + #, fuzzy + #| msgid "LOCALPATH:REMOTEDIR" + msgid "TARFILE:REMOTEDIR" + msgstr "ЛОКАЛЬНИЙШЛЯХ:ВІДДАЛЕНИЙКАТАЛОГ" + +-#: common/mlcustomize/customize_cmdline.ml:315 ++#: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" + msgstr "ПРИЗНАЧЕННЯ:ПОСИЛАННЯ[:ПОСИЛАННЯ..]" + +-#: common/mlcustomize/customize_cmdline.ml:435 ++#: common/mlcustomize/customize_cmdline.ml:443 + msgid "TIMEZONE" + msgstr "ЧАСОВИЙ_ПОЯС" + +-#: v2v/v2v.ml:223 ++#: v2v/v2v.ml:225 + msgid "" + "The --in-place option has been replaced by the ‘virt-v2v-in-place’ program" + msgstr "Параметр --in-place замінено на програму «virt-v2v-in-place»" + +-#: output/output_qemu.ml:231 ++#: output/output_qemu.ml:220 + msgid "" + "The Virt machine has no support for IDE. Please report a bug for virt-v2v -- " + "refer to virt-v2v(1) section \"BUGS\"." +@@ -1174,7 +1391,7 @@ msgstr "" + "розробки. Будь ласка, повідомте про ваду у virt-v2v — скористайтеся розділом " + "«BUGS» сторінки підручника virt-v2v(1)." + +-#: output/output_qemu.ml:252 ++#: output/output_qemu.ml:241 + msgid "" + "The Virt machine has no support for floppies. Please report a bug for virt-" + "v2v -- refer to virt-v2v(1) section \"BUGS\"." +@@ -1193,7 +1410,7 @@ msgstr "" + "передавання паролів не передбачено у RHV. Тому перетворений дисплей " + "гостьової системи не вимагатиме окремого пароля для встановлення з’єднання." + +-#: input/input_vmx.ml:89 ++#: input/input_vmx.ml:107 + msgid "" + "This transport does not support guests with snapshots. Either collapse the " + "snapshots for this guest and try the conversion again, or use one of the " +@@ -1206,51 +1423,83 @@ msgstr "" + "перетворення, які описано у підручнику з virt-v2v-input-vmware(1), розділ " + "«ПРИМІТКИ»." + +-#: common/mlcustomize/customize_cmdline.ml:448 ++#: common/mlcustomize/customize_cmdline.ml:456 + msgid "Truncate a file to zero size" + msgstr "Обрізати файл до нульового розміру" + +-#: common/mlcustomize/customize_cmdline.ml:202 ++#: common/mlcustomize/customize_run.ml:339 ++#, fuzzy ++#| msgid "%s: warning: %s" ++msgid "Truncating: %s" ++msgstr "%s: попередження: %s" ++ ++#: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" + msgstr "" + +-#: common/mlcustomize/customize_cmdline.ml:343 ++#: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" + msgstr "КОРИСТУВАЧ:ВАРІАНТ" + +-#: common/mlcustomize/customize_cmdline.ml:413 ++#: common/mlcustomize/customize_cmdline.ml:421 + msgid "USER[:SELECTOR]" + msgstr "КОРИСТУВАЧ[:СЕЛЕКТОР]" + +-#: common/mlcustomize/customize_cmdline.ml:465 ++#: common/mlcustomize/customize_cmdline.ml:473 + msgid "Uninstall package(s)" + msgstr "Вилучити пакунки" + +-#: common/mlcustomize/customize_cmdline.ml:407 ++#: common/mlcustomize/customize_run.ml:356 ++#, fuzzy ++#| msgid "Uninstall package(s)" ++msgid "Uninstalling packages: %s" ++msgstr "Вилучити пакунки" ++ ++#: common/mlcustomize/customize_run.ml:335 ++msgid "Unpack tar file: %s to %s" ++msgstr "" ++ ++#: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" + msgstr "Скасувати реєстрацію за допомогою subscription-manager" + +-#: common/mlcustomize/customize_cmdline.ml:471 ++#: common/mlcustomize/customize_run.ml:323 ++#, fuzzy ++#| msgid "Unregister using subscription-manager" ++msgid "Unregistering with subscription-manager" ++msgstr "Скасувати реєстрацію за допомогою subscription-manager" ++ ++#: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "Оновити пакунки" + +-#: common/mlcustomize/customize_cmdline.ml:482 ++#: common/mlcustomize/customize_run.ml:361 ++#, fuzzy ++#| msgid "Update packages" ++msgid "Updating packages" ++msgstr "Оновити пакунки" ++ ++#: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" + msgstr "Вивантажити локальний файл у систему призначення" + ++#: common/mlcustomize/customize_run.ml:366 ++msgid "Uploading: %s to %s" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" + msgstr "Використовувати послідовності ANSI для кольорів, навіть якщо це не tty" + +-#: v2v/v2v.ml:247 inspector/inspector.ml:172 in-place/in_place.ml:171 ++#: v2v/v2v.ml:249 inspector/inspector.ml:174 in-place/in_place.ml:173 + msgid "Use password from file to connect to input hypervisor" + msgstr "Скористатися паролем з файла для з'єднання із вхідним гіпервізором" + +-#: v2v/v2v.ml:271 ++#: v2v/v2v.ml:273 + msgid "Use password from file to connect to output hypervisor" + msgstr "Скористатися паролем з файла для з'єднання із вихідним гіпервізором" + +-#: v2v/v2v.ml:251 ++#: v2v/v2v.ml:253 + msgid "Use virt-v2v-in-place instead" + msgstr "Скористайтеся краще virt-v2v-in-place" + +@@ -1258,10 +1507,16 @@ msgstr "Скористайтеся краще virt-v2v-in-place" + msgid "Wrap log messages even if not tty" + msgstr "Переносити рядки повідомлень журналу, навіть якщо це не tty" + +-#: common/mlcustomize/customize_cmdline.ml:493 ++#: common/mlcustomize/customize_cmdline.ml:501 + msgid "Write file" + msgstr "Записати файл" + ++#: common/mlcustomize/customize_run.ml:391 ++#, fuzzy ++#| msgid "%s: warning: %s" ++msgid "Writing: %s" ++msgstr "%s: попередження: %s" ++ + #: lib/YAML.ml:162 + msgid "" + "YAML block contains newline character. This should not happen, please " +@@ -1301,6 +1556,12 @@ msgstr "" + "цілі». Ви також можете вилучити наявний домен у системі призначення за " + "допомогою команди «virsh undefine»." + ++#: common/mlcustomize/append_line.ml:44 ++#, fuzzy ++#| msgid "Append line(s) to the file" ++msgid "append_line: %s is not a file" ++msgstr "Дописати рядки до файла" ++ + #: lib/utils.ml:83 + msgid "" + "cannot find firmware for UEFI guests.\n" +@@ -1359,7 +1620,7 @@ msgstr "не вдалося обробити параметр --mac \"%s\"" + msgid "cannot parse --mac ip %s: doesn’t look like “%s” is an IP address" + msgstr "Не вдалося обробити --mac ip %s: здається, «%s» не є IP-адресою" + +-#: v2v/v2v.ml:139 inspector/inspector.ml:126 in-place/in_place.ml:120 ++#: v2v/v2v.ml:141 inspector/inspector.ml:128 in-place/in_place.ml:122 + msgid "cannot parse --mac ip prefix length field as an integer: %s" + msgstr "не вдалося обробити поле довжини префікса --mac ip як ціле число: %s" + +@@ -1410,12 +1671,12 @@ msgstr "" + "роботу virt-v2v (^C), а потім повторно запустити програму від імені " + "користувача root." + +-#: common/mlcustomize/customize_cmdline.ml:551 ++#: common/mlcustomize/customize_cmdline.ml:559 + msgid "command '%s' cannot be used in command files, see the man page" + msgstr "" + "у командних файлах не можна використовувати команду «%s», див. сторінку man" + +-#: common/mlcustomize/customize_cmdline.ml:568 ++#: common/mlcustomize/customize_cmdline.ml:576 + msgid "command '%s' not valid, see the man page" + msgstr "команда «%s» є некоректною, див. сторінку man" + +@@ -1423,7 +1684,7 @@ msgstr "команда «%s» є некоректною, див. сторінк + msgid "could not add grub2 serial console (ignored)" + msgstr "не вдалося додати послідовну консоль grub2 (проігноровано)" + +-#: input/parse_domain_from_vmx.ml:85 ++#: input/ssh.ml:52 + msgid "" + "could not copy the VMX file from the remote server, see earlier error " + "messages" +@@ -1431,7 +1692,7 @@ msgstr "" + "не вдалося скопіювати файл VMX з віддаленого сервера; див. попередні " + "повідомлення про помилки" + +-#: output/output_libvirt.ml:207 ++#: output/output_libvirt.ml:197 + msgid "" + "could not define libvirt domain: %s.\n" + "The libvirt XML is still available in ‘%s’. Try running ‘virsh -c %s define " +@@ -1471,8 +1732,8 @@ msgstr "" + + #. input/input_vddk.ml:127 + #. input/input_vcenter_https.ml:94 +-#. in-place/in_place.ml:268 +-#: v2v/v2v.ml:435 inspector/inspector.ml:266 input/input_xen_ssh.ml:71 ++#. in-place/in_place.ml:281 ++#: v2v/v2v.ml:448 inspector/inspector.ml:279 input/input_xen_ssh.ml:71 + msgid "could not parse '-ic %s'. Original error message was: %s" + msgstr "" + "не вдалося обробити параметр «-ic %s». Початкове повідомлення щодо помилки: " +@@ -1482,7 +1743,7 @@ msgstr "" + msgid "could not parse device name ‘%s’ from the source libvirt XML" + msgstr "не вдалося обробити назву пристрою «%s» XML libvirt джерела" + +-#: input/OVF.ml:167 ++#: input/OVF.ml:168 + msgid "could not parse disk rasd:HostResource from OVF document" + msgstr "не вдалося обробити значення rasd:HostResource диска з документа OVF" + +@@ -1509,7 +1770,7 @@ msgstr "" + "виведені grub дані не буде надіслано до послідовного порту, але, окрім " + "цього, не зашкодить. Початкове повідомлення щодо помилки: %s" + +-#: output/output_libvirt.ml:174 ++#: output/output_libvirt.ml:164 + msgid "could not refresh libvirt pool ‘%s’: %s" + msgstr "не вдалося оновити буфер libvirt «%s»: %s" + +@@ -1537,7 +1798,7 @@ msgstr "" + msgid "didn't find grub entry for kernel %s" + msgstr "не знайдено запис grub для ядра %s" + +-#: input/input_disk.ml:148 ++#: input/input_disk.ml:146 + msgid "disks on the command line have mixed formats" + msgstr "диски у командному рядку мають мішані формати" + +@@ -1596,7 +1857,7 @@ msgstr "" + msgid "duplicate -n/--network parameter. Only one default mapping is allowed." + msgstr "дублювання параметра -n/--network. Можлива лише одна типова прив’язка." + +-#: input/OVF.ml:142 ++#: input/OVF.ml:143 + msgid "error parsing disk fileRef" + msgstr "помилка під час спроби обробити fileRef диска" + +@@ -1620,7 +1881,7 @@ msgstr "виключення: %s" + msgid "exited with error %d" + msgstr "Роботу %s завершено зі станом виходу %d" + +-#: input/input_disk.ml:145 ++#: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" + msgstr "у рядку команди мало бути >= 1 назви диска" + +@@ -1641,13 +1902,13 @@ msgstr "" + "не пройдено попередніх перевірок сервера; див. попередні повідомлення про " + "помилки" + +-#: output/output_rhv_upload.ml:506 ++#: output/output_rhv_upload.ml:513 + msgid "failed to create virtual machine, see earlier errors" + msgstr "" + "не вдалося створити віртуальну машину; див. попередні повідомлення про " + "помилки" + +-#: output/output_rhv_upload.ml:478 ++#: output/output_rhv_upload.ml:485 + msgid "failed to finalize the transfers, see earlier errors" + msgstr "" + "не вдалося завершити перенесення; див. попередні повідомлення про помилки" +@@ -1658,16 +1919,16 @@ msgstr "" + "не вдалося знайти виконуваний файл grub2-mkconfig (втім, на гостьовій " + "системі виявлено Grub2)" + +-#: input/OVA.ml:456 ++#: input/OVA.ml:461 + msgid "failed to parse line returned by tar: %S" + msgstr "не вдалося обробити рядок, який повернуто tar: %S" + +-#: output/output_rhv_upload.ml:398 ++#: output/output_rhv_upload.ml:402 + msgid "failed to start transfer, see earlier errors" + msgstr "" + "не вдалося розпочати перенесення; див. попередні повідомлення про помилки" + +-#: output/output_rhv_upload.ml:318 ++#: output/output_rhv_upload.ml:321 + msgid "failed vmchecks, see earlier errors" + msgstr "" + "не вдалося пройти перевірки віртуальної машини; див. попередні повідомлення " +@@ -1693,7 +1954,7 @@ msgstr "" + msgid "generated by %s %s" + msgstr "створено за допомогою %s %s" + +-#: output/create_libvirt_xml.ml:147 ++#: output/create_libvirt_xml.ml:159 + msgid "get_osinfo_id: unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "" + "get_osinfo_id: невідома гостьова операційна система: %s %s %d.%d %s (%s)" +@@ -1715,14 +1976,25 @@ msgstr "" + "glance: помилка вивантаження образу до glance, див. попередні повідомлення " + "щодо помилок" + +-#: common/mlcustomize/firstboot.ml:165 ++#: common/mlcustomize/firstboot.ml:374 common/mlcustomize/firstboot.ml:165 + msgid "guest type %s is not supported" + msgstr "підтримки типу гостьової системи %s не передбачено" + +-#: common/mlcustomize/firstboot.ml:371 ++#: common/mlcustomize/firstboot.ml:401 + msgid "guest type %s/%s is not supported" + msgstr "підтримки типу гостьової системи %s/%s не передбачено" + ++#: common/mlcustomize/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 "" ++ ++#: common/mlcustomize/customize_run.ml:217 ++msgid "hostname could not be set for this type of guest" ++msgstr "" ++ + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." + msgstr "ігноруємо ядро %s у завантажувачі, оскільки його не існує." +@@ -1741,7 +2013,7 @@ msgstr "" + msgid "in the libvirt XML metadata, is missing or empty" + msgstr "у метаданих XML libvirt пропущено або вказано порожнє значення" + +-#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:104 ++#: input/input_vcenter_https.ml:52 input/input_libvirt.ml:102 + msgid "in-place mode does not work with HTTP source" + msgstr "режим «на місці» не працює із джерелами HTTP" + +@@ -1767,7 +2039,7 @@ msgstr "" + "дисків, які зберігаються на віддалених блокових пристроях. Див. підручник з " + "virt-v2v-input-xen(1), розділ «Xen or ssh conversions from block devices»." + +-#: v2v/v2v.ml:646 inspector/inspector.ml:384 in-place/in_place.ml:373 ++#: v2v/v2v.ml:665 inspector/inspector.ml:398 in-place/in_place.ml:387 + msgid "" + "insufficient free space in the conversion server temporary directory %s " + "(%s).\n" +@@ -1827,14 +2099,14 @@ msgstr "некоректний параметр -b/--bridge" + msgid "invalid -n/--network parameter" + msgstr "некоректний параметр -n/--network" + +-#: input/parse_domain_from_vmx.ml:440 ++#: input/parse_domain_from_vmx.ml:402 + msgid "invalid cpuid.coresPerSocket < number of vCPUs" + msgstr "" + "некоректне значення cpuid.coresPerSocket < кількості віртуальних процесорів" + +-#. common/mlcustomize/customize_cmdline.ml:163 +-#. common/mlcustomize/customize_cmdline.ml:155 +-#: common/mlcustomize/customize_cmdline.ml:171 ++#. common/mlcustomize/customize_cmdline.ml:165 ++#. common/mlcustomize/customize_cmdline.ml:157 ++#: common/mlcustomize/customize_cmdline.ml:173 + msgid "invalid format for '--%s' parameter, see the man page" + msgstr "некоректний формат параметра «--%s», див. сторінку підручника" + +@@ -1846,7 +2118,7 @@ msgstr "некоректний рядок форматування для --mach + msgid "invalid input filename (%s)" + msgstr "некоректна назва файла вхідних даних (%s)" + +-#: input/OVA.ml:440 ++#: input/OVA.ml:445 + msgid "invalid offset returned by tar: %S" + msgstr "tar повернуто некоректний відступ: %S" + +@@ -1862,10 +2134,30 @@ msgstr "некоректне виведення для --machine-readable: %s" + msgid "invalid output stream for --machine-readable: %s" + msgstr "некоректне потік виведення для --machine-readable: %s" + +-#: input/OVA.ml:445 ++#: common/mlcustomize/password.ml:73 ++#, fuzzy ++#| msgid "invalid format for '--%s' parameter, see the man page" ++msgid "invalid password selector ‘%s’; see the man page" ++msgstr "некоректний формат параметра «--%s», див. сторінку підручника" ++ ++#: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "tar повернуто некоректний розмір: %S" + ++#: common/mlcustomize/subscription_manager.ml:54 ++#, fuzzy ++#| msgid "invalid format for '--%s' parameter, see the man page" ++msgid "invalid sm-attach selector ‘%s’; see the man page" ++msgstr "некоректний формат параметра «--%s», див. сторінку підручника" ++ ++#: common/mlcustomize/subscription_manager.ml:41 ++msgid "invalid sm-credentials selector ‘%s’; see the man page" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:45 ++msgid "invalid ssh-inject selector ‘%s’; see the man page" ++msgstr "" ++ + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" + msgstr "некоректне значення vmw:CoresPerSocket (%d) проігноровано" +@@ -1896,6 +2188,12 @@ msgstr "" + "Домен libvirt «%s» працює або його призупинено. Роботу домену слід завершити " + "для виконання перетворення virt-v2v" + ++#: common/mlcustomize/customize_run.ml:47 ++#, fuzzy ++#| msgid "%s (ignored)" ++msgid "log file %s: %s (ignored)" ++msgstr "%s (проігноровано)" ++ + #: input/OVA.ml:147 + msgid "" + "making OVA directory public readable to work around libvirt bug https://" +@@ -1908,7 +2206,7 @@ msgstr "" + msgid "manifest has a checksum for non-existent file %s (ignored)" + msgstr "у маніфесті є контрольна сума файла, якого не існує %s (проігноровано)" + +-#: common/mlcustomize/customize_cmdline.ml:505 ++#: common/mlcustomize/customize_cmdline.ml:513 + msgid "md5|sha256|sha512" + msgstr "md5|sha256|sha512" + +@@ -1916,7 +2214,7 @@ msgstr "md5|sha256|sha512" + msgid "missing value for the key ‘%s’" + msgstr "немає значення для ключа «%s»" + +-#: input/OVA.ml:271 ++#: input/OVA.ml:276 + msgid "more than one .ovf file was found in %s" + msgstr "у %s виявлено декілька файлів .ovf" + +@@ -1937,7 +2235,13 @@ msgstr "" + "того, можливо, вам слід повторно запустити virt-v2v від імені користувача " + "root." + +-#: v2v/v2v.ml:685 ++#: common/mlcustomize/customize_run.ml:111 ++msgid "" ++"multiple --root-password/--password options set the password for user ‘%s’ " ++"twice" ++msgstr "" ++ ++#: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" + msgstr "" + "помилка під час спроби виконати nbdcopy, див. попередні повідомлення щодо " +@@ -1983,13 +2287,13 @@ msgstr "" + "\n" + "Див. також сторінку підручника virt-v2v-input-vmware(1)." + +-#: lib/nbdkit.ml:174 ++#: lib/nbdkit.ml:182 + msgid "nbdkit did not start up. See previous debugging messages for problems." + msgstr "" + "nbdkit не запустилася. Див. попередні діагностичні повідомлення, щоб виявити " + "джерело проблеми." + +-#: lib/nbdkit.ml:176 ++#: lib/nbdkit.ml:184 + msgid "" + "nbdkit did not start up. There may be errors printed by nbdkit above.\n" + "\n" +@@ -2050,7 +2354,7 @@ msgstr "" + "nbdkit є недостатньо новим, вам слід оновити nbdkit принаймні до версії " + "більшої або рівної %s" + +-#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:39 input/nbdkit_curl.ml:32 ++#: input/nbdkit_vddk.ml:40 input/nbdkit_ssh.ml:38 input/nbdkit_curl.ml:32 + msgid "nbdkit is too old. nbdkit >= %d.%d.%d is required." + msgstr "nbdkit є надто старим. Потрібен nbdkit >= %d.%d.%d." + +@@ -2066,7 +2370,7 @@ msgstr "" + "\n" + "Див. також підручник virt-v2v-output-rhv(1)." + +-#: output/output_rhv_upload.ml:199 ++#: output/output_rhv_upload.ml:200 + msgid "" + "nbdkit was compiled without SELinux support. You will have to recompile " + "nbdkit with libselinux-devel installed, or else set SELinux to Permissive " +@@ -2106,7 +2410,7 @@ msgstr "Додаток nbdkit-ssh не встановлено" + msgid "nbdkit-vddk-plugin is not installed" + msgstr "Додаток nbdkit-vddk не встановлено" + +-#: lib/nbdkit.ml:49 ++#: lib/nbdkit.ml:51 + msgid "nbdkit: unexpected version in --dump-config: %s" + msgstr "nbdkit: неочікувана версія у --dump-config: %s" + +@@ -2122,7 +2426,7 @@ msgstr "тут не можна використовувати -io (вхідні + msgid "no -oo (output options) are allowed here" + msgstr "тут не можна використовувати -oo (параметри виведення)" + +-#: input/OVA.ml:268 ++#: input/OVA.ml:273 + msgid "no .ovf file was found in %s" + msgstr "у %s не знайдено файла .ovf" + +@@ -2130,11 +2434,11 @@ msgstr "у %s не знайдено файла .ovf" + msgid "no bootloader detected" + msgstr "не виявлено завантажувача" + +-#: input/parse_domain_from_vmx.ml:400 ++#: input/parse_domain_from_vmx.ml:359 + msgid "no displayName key found in VMX file" + msgstr "у файлі VMX не виявлено ключа displayName" + +-#: input/OVF.ml:147 ++#: input/OVF.ml:148 + msgid "no href in ovf:File (id=%s)" + msgstr "немає href у ovf:File (id=%s)" + +@@ -2169,7 +2473,7 @@ msgstr "" + msgid "no python binary called ‘%s’ can be found on the $PATH" + msgstr "не знайдено виконуваного файла python із назвою «%s» у $PATH" + +-#: v2v/v2v.ml:466 inspector/inspector.ml:297 ++#: v2v/v2v.ml:479 inspector/inspector.ml:310 + msgid "" + "no support for remote libvirt connections to '-ic %s'. The conversion may " + "fail when it tries to read the source disks." +@@ -2232,13 +2536,13 @@ msgid "" + msgstr "" + "openstack: невідомий стан тому «%s»: стан мав бути «creating» або «available»" + +-#: output/output.ml:147 ++#: output/output.ml:146 + msgid "output mode only supports raw or qcow2 format (format: %s)" + msgstr "" + "для режиму введення передбачено підтримку лише форматів raw і qcow2 (формат: " + "%s)" + +-#: input/OVF.ml:262 ++#: input/OVF.ml:263 + msgid "" + "ova disk has an unknown VMware controller type (%d), please report this as a " + "bug supplying the *.ovf file extracted from the ova" +@@ -2246,7 +2550,7 @@ msgstr "" + "Диск ova має невідомий тип контролера VMware (%d). Будь ласка, повідомте про " + "цю ваду, додавши файл *.ovf, видобутий з ova" + +-#: input/OVF.ml:258 ++#: input/OVF.ml:259 + msgid "" + "ova disk has no parent controller, please report this as a bug supplying the " + "*.ovf file extracted from the ova" +@@ -2254,6 +2558,23 @@ msgstr "" + "Диск ova не має батьківського контролера. Будь ласка, повідомте про цю ваду, " + "додавши файл *.ovf, видобутий з ova" + ++#: common/mlcustomize/password.ml:51 ++msgid "" ++"password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " ++"or \"yescrypt\"" ++msgstr "" ++ ++#: common/mlcustomize/password.ml:196 ++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 "" ++ ++#: common/mlcustomize/customize_run.ml:404 ++msgid "passwords could not be set for this type of guest" ++msgstr "" ++ + #: lib/qemuNBD.ml:125 + msgid "" + "qemu-nbd did not start up. See previous debugging messages for problems." +@@ -2279,11 +2600,15 @@ msgstr "" + msgid "qemu-nbd: unexpected version in --version: %s" + msgstr "qemu-nbd: неочікувана версія у --version: %s" + ++#: common/mlcustomize/customize_run.ml:85 ++msgid "random seed could not be set for this type of guest" ++msgstr "" ++ + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" + msgstr "«%s» для віддаленого vmx не вдалося обробити як адресу" + +-#: output/output_rhv_upload.ml:373 ++#: output/output_rhv_upload.ml:376 + msgid "" + "rhv-upload: -of %s: Only output format ‘raw’ or ‘qcow2’ is supported. If " + "the input is in a different format then force one of these output formats by " +@@ -2294,8 +2619,9 @@ msgstr "" + "з цих форматів виведення за допомогою додавання до командного рядка " + "параметра «-of raw» або «-of qcow2»." + +-#. common/mlcustomize/inject_virtio_win.ml:347 +-#: common/mlcustomize/inject_virtio_win.ml:352 ++#. common/mlcustomize/inject_virtio_win.ml:380 ++#. common/mlcustomize/inject_virtio_win.ml:375 ++#: common/mlcustomize/inject_virtio_win.ml:385 + msgid "" + "root directory ‘/’ is missing from the virtio-win directory or ISO.\n" + "\n" +@@ -2350,7 +2676,7 @@ msgstr "" + "Ви можете обійти цю проблему, скориставшись параметром «--run*» або «--" + "firstboot*» (описано у підручнику щодо virt-customize(1))." + +-#: lib/utils.ml:196 ++#: lib/utils.ml:193 + msgid "" + "ssh-agent authentication has not been set up ($SSH_AUTH_SOCK is not set). " + "This is required by qemu to do passwordless ssh access. See the virt-v2v(1) " +@@ -2361,6 +2687,28 @@ msgstr "" + "доступу до ssh без пароля. Докладніший опис можна знайти на сторінці " + "підручника virt-v2v(1)." + ++#: common/mlcustomize/ssh_key.ml:57 ++msgid "ssh-inject: $HOME environment variable is not set" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:93 ++msgid "ssh-inject: key is an empty string" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:66 ++#, fuzzy ++#| msgid "Inject a public key into the guest" ++msgid "ssh-inject: no public key file found in %s" ++msgstr "Вставити відкритий ключ до гостьової системи" ++ ++#: common/mlcustomize/ssh_key.ml:83 ++msgid "ssh-inject: public key file (%s) is empty" ++msgstr "" ++ ++#: common/mlcustomize/ssh_key.ml:112 ++msgid "ssh-inject: the user %s does not exist on the guest" ++msgstr "" ++ + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + #, fuzzy + #| msgid "%s stopped by signal %d (%s)" +@@ -2375,12 +2723,16 @@ msgstr "підпроцес завершив роботу з ненульовим + msgid "subprocess signalled or stopped by signal %d" + msgstr "підпроцес надіслав сигнал або зупинив роботу внаслідок сигналу %d" + +-#: v2v/v2v.ml:215 ++#: common/mlcustomize/customize_run.ml:307 ++msgid "subscription-manager credentials required for --sm-register" ++msgstr "" ++ ++#: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" + msgstr "" + "параметр --no-trim вилучено зі списку параметрів, тепер він не потрібен" + +-#: v2v/v2v.ml:218 ++#: v2v/v2v.ml:220 + msgid "the --vmtype option has been removed and now does nothing" + msgstr "параметр --vmtype вилучено зі списку параметрів, тепер він не потрібен" + +@@ -2392,15 +2744,21 @@ msgstr "" + "не вдалося завантажити модуль Python «ovirtsdk4». Чи встановлено цей модуль? " + "Див. попередні повідомлення про помилки." + +-#: output/output_rhv_upload.ml:452 ++#: output/output_rhv_upload.ml:459 + msgid "the cluster ‘%s’ does not support the architecture %s but %s" + msgstr "на кластері «%s» не передбачено підтримки архітектури %s, але %s" + ++#: common/mlcustomize/customize_run.ml:67 ++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:81 + msgid "the key ‘%s’ was not found in a list of objects" + msgstr "ключа «%s» у списку об’єктів не знайдено" + +-#: output/output_rhv_upload.ml:295 ++#: output/output_rhv_upload.ml:298 + msgid "" + "the number of ‘-oo rhv-disk-uuid’ parameters passed on the command line has " + "to match the number of guest disk images (for this guest: %d)" +@@ -2419,7 +2777,7 @@ msgstr "" + "переданих за допомогою командного рядка, має дорівнювати кількості образів " + "дисків гостьових систем (для цієї гостьової системи: %d)" + +-#: output/output_libvirt.ml:235 ++#: output/output_libvirt.ml:225 + msgid "the target hypervisor does not support a %s KVM guest" + msgstr "" + "у гіпервізорі призначення не передбачено підтримки гостьових систем KVM %s" +@@ -2485,7 +2843,7 @@ msgstr "" + msgid "there are no UUIDs in the %s (%s). Is it really an OVirt or RHV-M %s?" + msgstr "у %s (%s) немає UUID. Це справді OVirt чи RHV-M %s?" + +-#: common/mlcustomize/inject_virtio_win.ml:175 ++#: common/mlcustomize/inject_virtio_win.ml:177 + msgid "" + "there are no virtio drivers available for this version of Windows (%d.%d %s " + "%s %s). virt-v2v looks for drivers in %s\n" +@@ -2498,7 +2856,7 @@ msgstr "" + "Гостьову систему буде налаштовано на використання повільніших емульованих " + "пристроїв." + +-#: common/mlcustomize/inject_virtio_win.ml:197 ++#: common/mlcustomize/inject_virtio_win.ml:199 + msgid "" + "there is no virtio block device driver for this version of Windows (%d.%d " + "%s). virt-v2v looks for this driver in %s\n" +@@ -2511,7 +2869,7 @@ msgstr "" + "Гостьову систему буде налаштовано на використання повільнішого емульованого " + "пристрою." + +-#: common/mlcustomize/inject_virtio_win.ml:228 ++#: common/mlcustomize/inject_virtio_win.ml:230 + msgid "" + "there is no virtio network driver for this version of Windows (%d.%d %s). " + "virt-v2v looks for this driver in %s\n" +@@ -2559,7 +2917,15 @@ msgid "this output module doesn't support copying more than %d disks" + msgstr "" + "у цьому модулі виведення не передбачено підтримки копіювання понад %d дисків" + +-#: input/OVA.ml:313 ++#: common/mlcustomize/timezone.ml:35 ++msgid "timezone '%s' does not exist, use a location like 'Europe/London'" ++msgstr "" ++ ++#: common/mlcustomize/customize_run.ml:349 ++msgid "timezone could not be set for this type of guest" ++msgstr "" ++ ++#: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" + msgstr "не вдалося обробити рядок з файла маніфесту: %S" + +@@ -2571,23 +2937,23 @@ msgstr "неочікуване завершення файла під час ч + msgid "unhandled checksum type ‘%s’" + msgstr "непридатний до обробки тип контрольних сум «%s»" + +-#: v2v/v2v.ml:156 inspector/inspector.ml:143 in-place/in_place.ml:137 ++#: v2v/v2v.ml:158 inspector/inspector.ml:145 in-place/in_place.ml:139 + msgid "unknown --root option: %s" + msgstr "невідомий параметр --root: %s" + +-#: v2v/v2v.ml:190 inspector/inspector.ml:157 in-place/in_place.ml:154 ++#: v2v/v2v.ml:192 inspector/inspector.ml:159 in-place/in_place.ml:156 + msgid "unknown -i option: %s" + msgstr "невідомий параметр -i: %s" + +-#: v2v/v2v.ml:210 ++#: v2v/v2v.ml:212 + msgid "unknown -o option: %s" + msgstr "невідомий параметр -o: %s" + +-#: v2v/v2v.ml:167 ++#: v2v/v2v.ml:169 + msgid "unknown -oa option: %s" + msgstr "невідомий параметр -oa: %s" + +-#: input/OVF.ml:102 ++#: input/OVF.ml:103 + msgid "unknown Config:firmware value %s (expected \"bios\" or \"efi\")" + msgstr "невідоме значення Config:firmware %s (мало бути «bios» або «efi»)" + +@@ -2595,11 +2961,11 @@ msgstr "невідоме значення Config:firmware %s (мало бути + msgid "unknown Windows 10 variant: %s (%s)" + msgstr "невідомий варіант Windows 10: %s (%s)" + +-#: v2v/v2v.ml:362 in-place/in_place.ml:222 ++#: v2v/v2v.ml:373 in-place/in_place.ml:233 + msgid "unknown block driver ‘--block-driver %s’" + msgstr "невідомий блоковий драйвер «--block-driver %s»" + +-#: input/parse_domain_from_vmx.ml:453 ++#: input/parse_domain_from_vmx.ml:415 + msgid "unknown firmware value '%s', assuming BIOS" + msgstr "невідоме значення мікропрограми, «%s», припускаємо BIOS" + +@@ -2607,11 +2973,11 @@ msgstr "невідоме значення мікропрограми, «%s», п + msgid "unknown guest operating system: %s %s %d.%d %s (%s)" + msgstr "невідома гостьова операційна система: %s %s %d.%d %s (%s)" + +-#: v2v/v2v.ml:371 inspector/inspector.ml:225 ++#: v2v/v2v.ml:383 inspector/inspector.ml:237 + msgid "unknown input transport ‘-it %s’" + msgstr "невідомий вхідний канал передавання «-it %s»" + +-#: input/parse_domain_from_vmx.ml:462 ++#: input/parse_domain_from_vmx.ml:424 + msgid "unknown sound device '%s' ignored" + msgstr "невідомий звуковий пристрій «%s» проігноровано" + +@@ -2619,7 +2985,7 @@ msgstr "невідомий звуковий пристрій «%s» проігн + msgid "unknown sound model %s ignored" + msgstr "невідому звукову модель %s проігноровано" + +-#: input/OVF.ml:155 ++#: input/OVF.ml:156 + msgid "unsupported compression in OVF: %s" + msgstr "непідтримуване стискання у OVF: %s" + +@@ -2728,7 +3094,7 @@ msgstr "" + "У virt-v2v не передбачено підтримки локальних дисплеїв, отже so у вхідних даних XML libvirt проігноровано" + +-#: in-place/in_place.ml:281 ++#: in-place/in_place.ml:294 + msgid "virt-v2v-in-place does not support remote libvirt URIs" + msgstr "У virt-v2v-in-place не передбачено підтримки віддалених адрес libvirt" + +@@ -2772,7 +3138,7 @@ msgstr "" + "«-io vddk-libdir=%s» не вказує на каталог. Див. підручник з virt-v2v-input-" + "vmware(1)." + +-#: output/output.ml:88 ++#: output/output.ml:87 + msgid "" + "‘-oo compressed’ is only allowed when the output format is a local qcow2-" + "format file, i.e. ‘-of qcow2’" +@@ -3019,9 +3385,6 @@ msgstr "Роботу %s завершено за допомогою сигнал + msgid "%s exited for an unknown reason (status %d)" + msgstr "Роботу %s завершено з невідомої причини (стан %d)" + +-#~ msgid "external command ‘%s’ exited with error %d" +-#~ msgstr "виконання зовнішньої програми «%s» завершилося помилкою %d" +- + #~ msgid "external command ‘%s’ killed by signal %d" + #~ msgstr "виконання зовнішньої програми «%s» завершено сигналом %d" + +@@ -3175,9 +3538,6 @@ msgstr "Роботу %s завершено з невідомої причини + #~ msgid "Converting the guest to run on KVM" + #~ msgstr "Перетворюємо гостьову систему для запуску у KVM" + +-#~ msgid "Copying disk %d/%d to %s (%s)" +-#~ msgstr "Копіювання диска %d з %d на %s (%s)" +- + #~ msgid "Copying disk %d/%d to qemu URI %s (%s)" + #~ msgstr "Копіюємо диск %d з %d до адреси qemu %s (%s)" + +@@ -3809,9 +4169,6 @@ msgstr "Роботу %s завершено з невідомої причини + #~ msgstr "" + #~ "допоміжної команди виведення (%s) не існує або вона не є працездатною" + +-#~ msgid "Copying remote disk %d/%d to %s" +-#~ msgstr "Копіюємо віддалений диск %d з %d до %s" +- + #~ msgid "Fetching the remote libvirt XML metadata ..." + #~ msgstr "Отримуємо метадані XML віддаленої libvirt…" + diff --git a/0003-common-mlcustomize-Inject-qemu-ga-blnsvr-into-firstb.patch b/0003-common-mlcustomize-Inject-qemu-ga-blnsvr-into-firstb.patch deleted file mode 100644 index ce13d10..0000000 --- a/0003-common-mlcustomize-Inject-qemu-ga-blnsvr-into-firstb.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 168eacf977ca49e96bc63ddc4109c27515ac0277 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 1 Aug 2024 10:36:52 +0100 -Subject: [PATCH] common: mlcustomize: Inject qemu-ga & blnsvr into - /Temp - -Update common submodule to pick up this further change which should -mean that for all Windows conversions, everything is confined to -C:\Program Files\Guestfs\Firstboot (except the virtio drivers -themselves). - -Richard W.M. Jones (1): - mlcustomize: Inject qemu-ga & blnsvr into /Temp ---- - common | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Submodule common d489469f..04116678: -diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml -index b04a3b38..2981bff5 100644 ---- a/common/mlcustomize/inject_virtio_win.ml -+++ b/common/mlcustomize/inject_virtio_win.ml -@@ -263,14 +263,28 @@ let rec inject_virtio_win_drivers ({ g } as t) reg = - } - ) - --and inject_qemu_ga t = -- let msi_files = copy_qemu_ga t in -+and inject_qemu_ga ({ g; root } as t) = -+ (* Copy the qemu-ga MSI(s) to the guest. *) -+ let dir, dir_win = Firstboot.firstboot_dir g root in -+ let dir_win = Option.value dir_win ~default:dir in -+ let tempdir = sprintf "%s/Temp" dir in -+ let tempdir_win = sprintf "%s\\Temp" dir_win in -+ g#mkdir_p tempdir; -+ -+ let msi_files = copy_qemu_ga t tempdir in - if msi_files <> [] then -- configure_qemu_ga t msi_files; -+ configure_qemu_ga t tempdir_win msi_files; - msi_files <> [] (* return true if we found some qemu-ga MSI files *) - --and inject_blnsvr t = -- let files = copy_blnsvr t in -+and inject_blnsvr ({ g; root } as t) = -+ (* Copy the files to the guest. *) -+ let dir, dir_win = Firstboot.firstboot_dir g root in -+ let dir_win = Option.value dir_win ~default:dir in -+ let tempdir = sprintf "%s/Temp" dir in -+ let tempdir_win = sprintf "%s\\Temp" dir_win in -+ g#mkdir_p tempdir; -+ -+ let files = copy_blnsvr t tempdir in - match files with - | [] -> false (* Didn't find or install anything. *) - -@@ -278,7 +292,7 @@ and inject_blnsvr t = - * drivers/by-driver). Pick the first. - *) - | blnsvr :: _ -> -- configure_blnsvr t blnsvr; -+ configure_blnsvr t tempdir_win blnsvr; - true - - and add_guestor_to_registry t ((g, root) as reg) drv_name drv_pciid = -@@ -360,13 +374,13 @@ and copy_drivers t driverdir = - (fun () -> - error (f_"root directory ‘/’ is missing from the virtio-win directory or ISO.\n\nThis should not happen and may indicate that virtio-win or virt-v2v is broken in some way. Please report this as a bug with a full debug log.")) - --and copy_qemu_ga t = -- copy_from_virtio_win t "/" "/" (virtio_iso_path_matches_qemu_ga t) -+and copy_qemu_ga t tempdir = -+ copy_from_virtio_win t "/" tempdir (virtio_iso_path_matches_qemu_ga t) - (fun () -> - error (f_"root directory ‘/’ is missing from the virtio-win directory or ISO.\n\nThis should not happen and may indicate that virtio-win or virt-v2v is broken in some way. Please report this as a bug with a full debug log.")) - --and copy_blnsvr t = -- copy_from_virtio_win t "/" "/" (virtio_iso_path_matches_blnsvr t) -+and copy_blnsvr t tempdir = -+ copy_from_virtio_win t "/" tempdir (virtio_iso_path_matches_blnsvr t) - (fun () -> - error (f_"root directory ‘/’ is missing from the virtio-win directory or ISO.\n\nThis should not happen and may indicate that virtio-win or virt-v2v is broken in some way. Please report this as a bug with a full debug log.")) - -@@ -578,7 +592,7 @@ and copy_from_libosinfo { g; i_osinfo; i_arch } destdir = - (* Install qemu-ga. [files] is the non-empty list of possible qemu-ga - * installers we detected. - *) --and configure_qemu_ga t files = -+and configure_qemu_ga t tempdir_win files = - let script = ref [] in - let add = List.push_back script in - -@@ -591,16 +605,17 @@ and configure_qemu_ga t files = - add ""; - add "# Run qemu-ga installers"; - List.iter ( -- fun msi_path -> -- add (sprintf "Start-Process -Wait -FilePath \"C:\\%s\" -ArgumentList \"/norestart\",\"/qn\",\"/l+*vx\",\"C:\\%s.log\"" -- msi_path msi_path) -+ fun msi -> -+ (* [`] is an escape char for quotes *) -+ add (sprintf "Start-Process -Wait -FilePath \"%s\\%s\" -ArgumentList \"/norestart\",\"/qn\",\"/l+*vx\",\"`\"%s\\%s.log`\"\"" -+ tempdir_win msi tempdir_win msi) - ) files; - - Firstboot.add_firstboot_powershell t.g t.root "install-qemu-ga" !script - --and configure_blnsvr t blnsvr = -+and configure_blnsvr t tempdir_win blnsvr = - let cmd = sprintf "\ - @echo off\n\ - echo Installing %s\n\ -- c:\\%s -i\n" blnsvr blnsvr in -- Firstboot.add_firstboot_script t.g t.root (sprintf "install-%s" blnsvr) cmd -+ \"%s\\%s\" -i\n" blnsvr tempdir_win blnsvr in -+ Firstboot.add_firstboot_script t.g t.root "install-blnsvr" cmd diff --git a/0004-Translated-using-Weblate-Ukrainian.patch b/0004-Translated-using-Weblate-Ukrainian.patch new file mode 100644 index 0000000..3282912 --- /dev/null +++ b/0004-Translated-using-Weblate-Ukrainian.patch @@ -0,0 +1,161 @@ +From e34f5c7e4430764d4402d1364072299c0e9395b8 Mon Sep 17 00:00:00 2001 +From: Yuri Chornoivan +Date: Tue, 3 Sep 2024 16:41:33 +0200 +Subject: [PATCH] Translated using Weblate (Ukrainian) + +Currently translated at 95.4% (527 of 552 strings) + +Translation: libguestfs/virt-v2v-master +Translate-URL: https://translate.fedoraproject.org/projects/libguestfs/virt-v2v-master/uk/ +--- + po/uk.po | 39 +++++++++++++++++++-------------------- + 1 file changed, 19 insertions(+), 20 deletions(-) + +diff --git a/po/uk.po b/po/uk.po +index 047434a7..8a2891ec 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -12,10 +12,10 @@ + msgid "" + 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" ++"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug." ++"cgi?component=libguestfs&product=Virtualization+Tools\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" +-"PO-Revision-Date: 2023-06-05 07:20+0000\n" ++"PO-Revision-Date: 2024-09-03 14:41+0000\n" + "Last-Translator: Yuri Chornoivan \n" + "Language-Team: Ukrainian \n" +@@ -25,7 +25,7 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " + "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +-"X-Generator: Weblate 4.17\n" ++"X-Generator: Weblate 5.7.1\n" + + #: input/input_ova.ml:136 common/mltools/tools_utils.ml:235 + msgid "%s" +@@ -77,7 +77,7 @@ msgstr "" + + #: common/mlcustomize/customize_run.ml:121 + msgid "%s ignored for non-Windows guest" +-msgstr "" ++msgstr "%s проігноровано для відмінної від Windows гостьової системи" + + #: common/mlcustomize/customize_run.ml:194 + #, fuzzy +@@ -243,24 +243,29 @@ msgstr "" + + #: common/mlcustomize/customize_run.ml:160 + msgid "--chown: could not parse numeric UID:GID from %s:%s" +-msgstr "" ++msgstr "--chown: не вдалося визначити числові значення UID:GID на основі %s:%s" + + #: common/mlcustomize/customize_run.ml:224 + msgid "" + "--inject-blnsvr: blnsvr.exe not found in virtio-win source that you specified" + msgstr "" ++"--inject-blnsvr: blnsvr.exe не знайдено у вказаному вами джерелі virtio-win" + + #: common/mlcustomize/customize_run.ml:233 + msgid "" + "--inject-qemu-ga: QEMU Guest Agent MSI not found in virtio-win source that " + "you specified" + msgstr "" ++"--inject-qemu-ga: не знайдено MSI гостьового агента QEMU у вказаному вами " ++"джерелі virtio-win" + + #: common/mlcustomize/customize_run.ml:249 + msgid "" + "--inject-virtio-win: virtio drivers were not found for this Windows version " + "in the virtio-win source that you specified" + msgstr "" ++"--inject-virtio-win: не знайдено драйверів virtio для цієї версії Windows у " ++"вказаному вами джерелі virtio-win" + + #: v2v/v2v.ml:144 inspector/inspector.ml:131 in-place/in_place.ml:125 + msgid "--mac ip prefix length field is out of range" +@@ -586,7 +591,7 @@ msgstr "Завантажитися у qemu (лише для -o qemu)" + + #: common/mlcustomize/customize_cmdline.ml:209 + msgid "Change the owner user and group ID of a file or directory" +-msgstr "" ++msgstr "Змінити ідентифікатор користувача і групи власника файла або каталогу" + + #: common/mlcustomize/customize_cmdline.ml:198 + msgid "Change the permissions of a file" +@@ -594,7 +599,7 @@ msgstr "Змінити права доступу до файла" + + #: common/mlcustomize/customize_run.ml:163 + msgid "Changing owner of %s to %d:%d" +-msgstr "" ++msgstr "Змінюємо власника %s на %d:%d" + + #: common/mlcustomize/customize_run.ml:149 + #, fuzzy +@@ -615,10 +620,8 @@ msgid "Copy files in disk image" + msgstr "Копіювати файли на образ диска" + + #: common/mlcustomize/customize_cmdline.ml:438 +-#, fuzzy +-#| msgid "Copy local files or directories into image" + msgid "Copy local files or directories from a tarball into image" +-msgstr "Копіювати локальні файли або каталоги до образу" ++msgstr "Копіювати локальні файли або каталоги з архіву tar до образу" + + #: common/mlcustomize/customize_cmdline.ml:242 + msgid "Copy local files or directories into image" +@@ -769,10 +772,8 @@ msgid "Inject a public key into the guest" + msgstr "Вставити відкритий ключ до гостьової системи" + + #: common/mlcustomize/customize_cmdline.ml:294 +-#, fuzzy +-#| msgid "Inject virtio-win drivers into a Windows guest" + msgid "Inject the Balloon Server into a Windows guest" +-msgstr "Вставити драйвери virtio-win до гостьової системи Windows" ++msgstr "Вставити Balloon Server до гостьової системи Windows" + + #: common/mlcustomize/customize_cmdline.ml:300 + msgid "Inject the QEMU Guest Agent into a Windows guest" +@@ -1167,7 +1168,7 @@ msgstr "ДЖЕРЕЛО:ПРИЗНАЧЕННЯ" + + #: common/mlcustomize/customize_run.ml:332 + msgid "SSH key could not be injected for this type of guest" +-msgstr "" ++msgstr "Ключ SSH не можна вставляти до цього типу гостьових систем" + + #: common/mlcustomize/customize_run.ml:329 + msgid "SSH key inject: %s" +@@ -1364,10 +1365,8 @@ msgid "Specify a LUKS key" + msgstr "Вказати ключ LUKS" + + #: common/mlcustomize/customize_cmdline.ml:433 +-#, fuzzy +-#| msgid "LOCALPATH:REMOTEDIR" + msgid "TARFILE:REMOTEDIR" +-msgstr "ЛОКАЛЬНИЙШЛЯХ:ВІДДАЛЕНИЙКАТАЛОГ" ++msgstr "ФАЙЛTAR:ВІДДАЛЕНИЙКАТАЛОГ" + + #: common/mlcustomize/customize_cmdline.ml:323 + msgid "TARGET:LINK[:LINK..]" +@@ -1435,7 +1434,7 @@ msgstr "%s: попередження: %s" + + #: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" +-msgstr "" ++msgstr "UID:GID:ШЛЯХ" + + #: common/mlcustomize/customize_cmdline.ml:351 + msgid "USER:SELECTOR" +@@ -1457,7 +1456,7 @@ msgstr "Вилучити пакунки" + + #: common/mlcustomize/customize_run.ml:335 + msgid "Unpack tar file: %s to %s" +-msgstr "" ++msgstr "Розпаковування файла tar: %s до %s" + + #: common/mlcustomize/customize_cmdline.ml:415 + msgid "Unregister using subscription-manager" diff --git a/0004-docs-Add-a-note-about-removal-of-VMware-Tools-on-Win.patch b/0004-docs-Add-a-note-about-removal-of-VMware-Tools-on-Win.patch deleted file mode 100644 index 65d461a..0000000 --- a/0004-docs-Add-a-note-about-removal-of-VMware-Tools-on-Win.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c952f310c902e438a8b0b5240a4b486b698bede8 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Mon, 5 Aug 2024 10:08:34 +0100 -Subject: [PATCH] docs: Add a note about removal of VMware Tools on Windows - -We use VMware's recommended method for removal, but we know from -experience that this rarely works. The alternate method being -proposed involves making very invasive changes to the Registry and -filesystem, which are inappropriate for virt-v2v to do and highly -risky. Therefore simply document this, with notes for the virt-v2v -user if they want to try the risky method. - -Fixes: https://issues.redhat.com/browse/RHEL-51169 -Thanks: Yan Vugenfirer -Reported-by: Ming Xie ---- - docs/virt-v2v.pod | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index dfe92d77..92941026 100644 ---- a/docs/virt-v2v.pod -+++ b/docs/virt-v2v.pod -@@ -1299,6 +1299,21 @@ B Take care not to interrupt the automatic driver installation - process when logging in to the guest for the first time, as this may - prevent the guest from subsequently booting correctly. - -+=head3 Removing VMware Tools from Windows guests -+ -+Virt-v2v attempts to remove VMware Tools. For Windows guests this is -+supposed to happen during the first boot after conversion. -+ -+We use VMware's recommended uninstallation method as that is the -+safest choice. However our experience has shown that this method -+usually fails. If so, VMware Tools must be removed by some other -+method. -+ -+One possible method is described here: -+L -+You should carefully check this script since it makes very invasive -+changes to the Windows Registry and filesystem. -+ - =head2 Free space for conversion - - =head3 Free space in the guest diff --git a/0005-Translated-using-Weblate-Ukrainian.patch b/0005-Translated-using-Weblate-Ukrainian.patch new file mode 100644 index 0000000..f12bbba --- /dev/null +++ b/0005-Translated-using-Weblate-Ukrainian.patch @@ -0,0 +1,427 @@ +From e618c18bf4c865e72f5ed4873abafccccaba24e1 Mon Sep 17 00:00:00 2001 +From: Weblate Translation Memory + +Date: Tue, 3 Sep 2024 16:41:33 +0200 +Subject: [PATCH] Translated using Weblate (Ukrainian) + +Currently translated at 95.4% (527 of 552 strings) + +Translation: libguestfs/virt-v2v-master +Translate-URL: https://translate.fedoraproject.org/projects/libguestfs/virt-v2v-master/uk/ +--- + po/uk.po | 138 +++++++++++++++++++------------------------------------ + 1 file changed, 46 insertions(+), 92 deletions(-) + +diff --git a/po/uk.po b/po/uk.po +index 8a2891ec..8b616872 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -16,7 +16,8 @@ msgstr "" + "cgi?component=libguestfs&product=Virtualization+Tools\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2024-09-03 14:41+0000\n" +-"Last-Translator: Yuri Chornoivan \n" ++"Last-Translator: Weblate Translation Memory \n" + "Language-Team: Ukrainian \n" + "Language: uk\n" +@@ -49,7 +50,7 @@ msgstr "%s не повернуто жодних даних" + + #: common/mlcustomize/customize_run.ml:191 + msgid "%s does not exist in the guest" +-msgstr "" ++msgstr "%s не існує у гостьовій системі" + + #: output/output_rhv.ml:273 + msgid "" +@@ -80,10 +81,8 @@ msgid "%s ignored for non-Windows guest" + msgstr "%s проігноровано для відмінної від Windows гостьової системи" + + #: common/mlcustomize/customize_run.ml:194 +-#, fuzzy +-#| msgid "Inject a public key into the guest" + msgid "%s is not a regular file in the guest" +-msgstr "Вставити відкритий ключ до гостьової системи" ++msgstr "%s не є звичайним файлом у гостьовій системі" + + #. inspector/inspector.ml:151 + #. inspector/inspector.ml:40 +@@ -114,10 +113,8 @@ msgid "%s: cannot open virtio-win ISO file: %s" + msgstr "%s: не вдалося відкрити файл ISO virtio-win: %s" + + #: common/mlcustomize/customize_run.ml:72 +-#, fuzzy +-#| msgid "external command ‘%s’ exited with error %d" + msgid "%s: command exited with an error" +-msgstr "виконання зовнішньої програми «%s» завершилося помилкою %d" ++msgstr "%s: виконання команди завершилося повідомленням про помилку" + + #: v2v/v2v.ml:326 + msgid "" +@@ -240,6 +237,9 @@ msgid "" + "--append-line: line must not contain newline characters. Use the --append-" + "line option multiple times to add several lines." + msgstr "" ++"--append-line: рядок не повинен містити символів розриву рядка. " ++"Скористайтеся параметром --append-line потрібну кількість разів, щоб додати " ++"декілька рядків." + + #: common/mlcustomize/customize_run.ml:160 + msgid "--chown: could not parse numeric UID:GID from %s:%s" +@@ -564,26 +564,20 @@ msgid "Append line(s) to the file" + msgstr "Дописати рядки до файла" + + #: common/mlcustomize/customize_run.ml:145 +-#, fuzzy +-#| msgid "Append line(s) to the file" + msgid "Appending line to %s" +-msgstr "Дописати рядки до файла" ++msgstr "Дописуємо рядок до %s" + + #: common/mlcustomize/customize_cmdline.ml:397 + msgid "Attach to a subscription-manager pool" + msgstr "Долучити до буфера subscription-manager" + + #: common/mlcustomize/customize_run.ml:293 +-#, fuzzy +-#| msgid "Attach to a subscription-manager pool" + msgid "Attaching to compatible subscriptions" +-msgstr "Долучити до буфера subscription-manager" ++msgstr "Долучаємо до сумісних підписок" + + #: common/mlcustomize/customize_run.ml:297 +-#, fuzzy +-#| msgid "Setting up the source: %s" + msgid "Attaching to the pool %s" +-msgstr "Налаштовуємо джерело: %s" ++msgstr "Долучаємо до буфера %s" + + #: v2v/v2v.ml:281 + msgid "Boot in qemu (-o qemu only)" +@@ -602,10 +596,8 @@ msgid "Changing owner of %s to %d:%d" + msgstr "Змінюємо власника %s на %d:%d" + + #: common/mlcustomize/customize_run.ml:149 +-#, fuzzy +-#| msgid "Change the permissions of a file" + msgid "Changing permissions of %s to %s" +-msgstr "Змінити права доступу до файла" ++msgstr "Зміна прав доступу до %s на %s" + + #: common/mlcustomize/customize_cmdline.ml:529 + msgid "Compatibility option doing nothing" +@@ -628,20 +620,16 @@ msgid "Copy local files or directories into image" + msgstr "Копіювати локальні файли або каталоги до образу" + + #: common/mlcustomize/customize_run.ml:176 +-#, fuzzy +-#| msgid "Copying remote disk %d/%d to %s" + msgid "Copying (in image): %s to %s" +-msgstr "Копіюємо віддалений диск %d з %d до %s" ++msgstr "Копіюємо (на образ): %s у %s" + + #: v2v/v2v.ml:616 + msgid "Copying disk %d/%d" + msgstr "Копіювання диска %d з %d" + + #: common/mlcustomize/customize_run.ml:180 +-#, fuzzy +-#| msgid "Copying disk %d/%d to %s (%s)" + msgid "Copying: %s to %s" +-msgstr "Копіювання диска %d з %d на %s (%s)" ++msgstr "Копіюємо %s до %s" + + #: common/mlcustomize/customize_cmdline.ml:334 + msgid "Create a directory" +@@ -668,10 +656,8 @@ msgid "Delete a file or directory" + msgstr "Вилучити файл або каталог" + + #: common/mlcustomize/customize_run.ml:184 +-#, fuzzy +-#| msgid "exception: %s" + msgid "Deleting: %s" +-msgstr "виключення: %s" ++msgstr "Вилучаємо: %s" + + #: common/mltools/getopt.ml:229 + msgid "Display brief help" +@@ -699,7 +685,7 @@ msgstr "Редагувати файл за допомогою виразу Perl" + + #: common/mlcustomize/customize_run.ml:188 + msgid "Editing: %s" +-msgstr "" ++msgstr "Редагування: %s" + + #: common/mltools/tools_utils.ml:386 + msgid "Enable libguestfs debugging messages" +@@ -837,21 +823,19 @@ msgstr "Вхідне передавання" + + #: common/mlcustomize/customize_run.ml:199 + msgid "Installing firstboot command: %s" +-msgstr "" ++msgstr "Встановлюємо програму firstboot: %s" + + #: common/mlcustomize/customize_run.ml:203 + msgid "Installing firstboot packages: %s" +-msgstr "" ++msgstr "Встановлюємо пакунки firstboot: %s" + + #: common/mlcustomize/customize_run.ml:210 + msgid "Installing firstboot script: %s" +-msgstr "" ++msgstr "Встановлюємо скрипт firstboot: %s" + + #: common/mlcustomize/customize_run.ml:256 +-#, fuzzy +-#| msgid "Uninstall package(s)" + msgid "Installing packages: %s" +-msgstr "Вилучити пакунки" ++msgstr "Встановлюємо пакунки: %s" + + #: common/mlcustomize/customize_cmdline.ml:237 + msgid "LOCALPATH:REMOTEDIR" +@@ -863,7 +847,7 @@ msgstr "Адреса libvirt" + + #: common/mlcustomize/customize_run.ml:263 + msgid "Linking: %s -> %s" +-msgstr "" ++msgstr "Компонування: %s -> %s" + + #. common/mlcustomize/customize_cmdline.ml:299 + #. common/mlcustomize/customize_cmdline.ml:293 +@@ -877,7 +861,7 @@ msgstr "Зробити машину виведення придатною до + + #: common/mlcustomize/customize_run.ml:268 + msgid "Making directory: %s" +-msgstr "" ++msgstr "Створюємо каталог: %s" + + #: v2v/v2v.ml:255 inspector/inspector.ml:178 in-place/in_place.ml:175 + msgid "Map NIC to network or bridge or assign static IP" +@@ -898,7 +882,7 @@ msgstr "Пересунути файли на образ диска" + + #: common/mlcustomize/customize_run.ml:272 + msgid "Moving: %s -> %s" +-msgstr "" ++msgstr "Пересуваємо: %s -> %s" + + #. input/input_vcenter_https.ml:45 + #. input/input_ova.ml:36 +@@ -1085,30 +1069,24 @@ msgid "Recursively truncate all files in directory" + msgstr "Рекурсивно обрізати усі файли у каталозі" + + #: common/mlcustomize/customize_run.ml:343 +-#, fuzzy +-#| msgid "Recursively truncate all files in directory" + msgid "Recursively truncating: %s" +-msgstr "Рекурсивно обрізати усі файли у каталозі" ++msgstr "Рекурсивно обрізаємо: %s" + + #: common/mlcustomize/customize_cmdline.ml:403 + msgid "Register using subscription-manager" + msgstr "Зареєструвати за допомогою subscription-manager" + + #: common/mlcustomize/customize_run.ml:303 +-#, fuzzy +-#| msgid "Register using subscription-manager" + msgid "Registering with subscription-manager" +-msgstr "Зареєструвати за допомогою subscription-manager" ++msgstr "Реєструємо за допомогою subscription-manager" + + #: common/mlcustomize/customize_cmdline.ml:409 + msgid "Remove all the subscriptions" + msgstr "Вилучити усі підписки" + + #: common/mlcustomize/customize_run.ml:318 +-#, fuzzy +-#| msgid "Remove all the subscriptions" + msgid "Removing all the subscriptions" +-msgstr "Вилучити усі підписки" ++msgstr "Вилучаємо усі підписки" + + #: v2v/v2v.ml:269 + msgid "Rename guest when converting" +@@ -1136,14 +1114,12 @@ msgstr "Обробити файл за допомогою touch" + + #: common/mlcustomize/customize_run.ml:352 + msgid "Running touch: %s" +-msgstr "" ++msgstr "Виконуємо touch: %s" + + #. common/mlcustomize/customize_run.ml:167 + #: common/mlcustomize/customize_run.ml:282 +-#, fuzzy +-#| msgid "%s: warning: %s" + msgid "Running: %s" +-msgstr "%s: попередження: %s" ++msgstr "Виконуємо: %s" + + #. common/mlcustomize/customize_cmdline.ml:264 + #: common/mlcustomize/customize_cmdline.ml:373 +@@ -1159,7 +1135,7 @@ msgstr "СЕЛЕКТОР" + + #: common/mlcustomize/customize_run.ml:408 + msgid "SELinux relabelling" +-msgstr "" ++msgstr "Зміна міток SELinux" + + #. common/mlcustomize/customize_cmdline.ml:226 + #: common/mlcustomize/customize_cmdline.ml:340 +@@ -1172,7 +1148,7 @@ msgstr "Ключ SSH не можна вставляти до цього типу + + #: common/mlcustomize/customize_run.ml:329 + msgid "SSH key inject: %s" +-msgstr "" ++msgstr "Вставлення ключа SSH: %s" + + #: v2v/v2v.ml:285 + msgid "Same as ‘-io vddk-config=filename’" +@@ -1243,14 +1219,12 @@ msgid "Scrub build log file" + msgstr "Витерти файл журналу збирання" + + #: common/mlcustomize/customize_run.ml:419 +-#, fuzzy +-#| msgid "Scrub build log file" + msgid "Scrubbing the log file" +-msgstr "Витерти файл журналу збирання" ++msgstr "Витираємо файл журналу" + + #: common/mlcustomize/customize_run.ml:287 + msgid "Scrubbing: %s" +-msgstr "" ++msgstr "Витираємо: %s" + + #: v2v/v2v.ml:233 + msgid "Set bandwidth dynamically from file" +@@ -1318,35 +1292,27 @@ msgstr "Встановити пароль користувача" + + #: common/mlcustomize/customize_run.ml:83 + msgid "Setting a random seed" +-msgstr "" ++msgstr "Встановлюємо базу випадковості" + + #: common/mlcustomize/customize_run.ml:399 +-#, fuzzy +-#| msgid "Set root password" + msgid "Setting passwords" +-msgstr "Встановлення пароля root" ++msgstr "Встановлення паролів" + + #: common/mlcustomize/password.ml:113 + msgid "Setting random password of %s to %s" +-msgstr "" ++msgstr "Встановлюємо випадковий пароль %s у значення %s" + + #: common/mlcustomize/customize_run.ml:215 +-#, fuzzy +-#| msgid "Set the hostname" + msgid "Setting the hostname: %s" +-msgstr "Встановити назву вузла" ++msgstr "Встановлюємо назву вузла: %s" + + #: common/mlcustomize/customize_run.ml:98 +-#, fuzzy +-#| msgid "Setting up the destination: %s" + msgid "Setting the machine ID in %s" +-msgstr "Налаштовуємо призначення: %s" ++msgstr "Встановлюємо ідентифікатор комп'ютера у %s" + + #: common/mlcustomize/customize_run.ml:347 +-#, fuzzy +-#| msgid "Setting up the destination: %s" + msgid "Setting the timezone: %s" +-msgstr "Налаштовуємо призначення: %s" ++msgstr "Встановлюємо часовий пояс: %s" + + #: v2v/v2v.ml:588 + msgid "Setting up the destination: %s" +@@ -1427,10 +1393,8 @@ msgid "Truncate a file to zero size" + msgstr "Обрізати файл до нульового розміру" + + #: common/mlcustomize/customize_run.ml:339 +-#, fuzzy +-#| msgid "%s: warning: %s" + msgid "Truncating: %s" +-msgstr "%s: попередження: %s" ++msgstr "Обрізаємо: %s" + + #: common/mlcustomize/customize_cmdline.ml:204 + msgid "UID:GID:PATH" +@@ -1449,10 +1413,8 @@ msgid "Uninstall package(s)" + msgstr "Вилучити пакунки" + + #: common/mlcustomize/customize_run.ml:356 +-#, fuzzy +-#| msgid "Uninstall package(s)" + msgid "Uninstalling packages: %s" +-msgstr "Вилучити пакунки" ++msgstr "Вилучаємо пакунки: %s" + + #: common/mlcustomize/customize_run.ml:335 + msgid "Unpack tar file: %s to %s" +@@ -1463,20 +1425,16 @@ msgid "Unregister using subscription-manager" + msgstr "Скасувати реєстрацію за допомогою subscription-manager" + + #: common/mlcustomize/customize_run.ml:323 +-#, fuzzy +-#| msgid "Unregister using subscription-manager" + msgid "Unregistering with subscription-manager" +-msgstr "Скасувати реєстрацію за допомогою subscription-manager" ++msgstr "Скасовуємо реєстрацію за допомогою subscription-manager" + + #: common/mlcustomize/customize_cmdline.ml:479 + msgid "Update packages" + msgstr "Оновити пакунки" + + #: common/mlcustomize/customize_run.ml:361 +-#, fuzzy +-#| msgid "Update packages" + msgid "Updating packages" +-msgstr "Оновити пакунки" ++msgstr "Оновлюємо пакунки" + + #: common/mlcustomize/customize_cmdline.ml:490 + msgid "Upload local file to destination" +@@ -1484,7 +1442,7 @@ msgstr "Вивантажити локальний файл у систему п + + #: common/mlcustomize/customize_run.ml:366 + msgid "Uploading: %s to %s" +-msgstr "" ++msgstr "Вивантажуємо: %s до %s" + + #: common/mltools/tools_utils.ml:391 + msgid "Use ANSI colour sequences even if not tty" +@@ -1511,10 +1469,8 @@ msgid "Write file" + msgstr "Записати файл" + + #: common/mlcustomize/customize_run.ml:391 +-#, fuzzy +-#| msgid "%s: warning: %s" + msgid "Writing: %s" +-msgstr "%s: попередження: %s" ++msgstr "Записуємо: %s" + + #: lib/YAML.ml:162 + msgid "" +@@ -1556,10 +1512,8 @@ msgstr "" + "допомогою команди «virsh undefine»." + + #: common/mlcustomize/append_line.ml:44 +-#, fuzzy +-#| msgid "Append line(s) to the file" + msgid "append_line: %s is not a file" +-msgstr "Дописати рядки до файла" ++msgstr "append_line: %s не є файлом" + + #: lib/utils.ml:83 + msgid "" +@@ -1827,7 +1781,7 @@ msgstr "" + + #: common/mltools/curl.ml:82 + msgid "downloading %s" +-msgstr "" ++msgstr "Отримуємо: %s" + + #: lib/networks.ml:84 + msgid "" diff --git a/0005-Update-common-submodule.patch b/0005-Update-common-submodule.patch deleted file mode 100644 index c2b6872..0000000 --- a/0005-Update-common-submodule.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7bc9b115baba6df2969451cd6907e2d7543ef22d Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Mon, 5 Aug 2024 10:18:31 +0100 -Subject: [PATCH] Update common submodule - -Richard W.M. Jones (1): - mlcustomize: Write qemu-ga log file name to log.txt ---- - common | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Submodule common 04116678..7b84a370: -diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml -index 2981bff5..afec1e45 100644 ---- a/common/mlcustomize/inject_virtio_win.ml -+++ b/common/mlcustomize/inject_virtio_win.ml -@@ -606,6 +606,8 @@ and configure_qemu_ga t tempdir_win files = - add "# Run qemu-ga installers"; - List.iter ( - fun msi -> -+ add (sprintf "Write-Host \"Writing log to %s\\%s.log\"" -+ tempdir_win msi); - (* [`] is an escape char for quotes *) - add (sprintf "Start-Process -Wait -FilePath \"%s\\%s\" -ArgumentList \"/norestart\",\"/qn\",\"/l+*vx\",\"`\"%s\\%s.log`\"\"" - tempdir_win msi tempdir_win msi) diff --git a/0006-Pull-in-a-fix-to-make-Windows-firstboot-more-reliabl.patch b/0006-Pull-in-a-fix-to-make-Windows-firstboot-more-reliabl.patch deleted file mode 100644 index 1c96f71..0000000 --- a/0006-Pull-in-a-fix-to-make-Windows-firstboot-more-reliabl.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 50f005f8b7034916588855c15b10a0195bf54b23 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 8 Aug 2024 10:40:24 +0100 -Subject: [PATCH] Pull in a fix to make Windows firstboot more reliable. - -Update the common submodule to get: - -Richard W.M. Jones (2): - mlcustomize: Add some comments to firstboot batch file - mlcustomize: Reboot Windows between each firstboot script - -Document that Windows may now reboot several times after conversion. ---- - common | 2 +- - docs/virt-v2v.pod | 9 ++++++--- - 2 files changed, 7 insertions(+), 4 deletions(-) - -Submodule common 7b84a370..a7883967: -diff --git a/common/mlcustomize/firstboot.ml b/common/mlcustomize/firstboot.ml -index 3bbba714..52e76401 100644 ---- a/common/mlcustomize/firstboot.ml -+++ b/common/mlcustomize/firstboot.ml -@@ -278,6 +278,9 @@ module Windows = struct - (* Write a firstboot.bat control script which just runs the other - * scripts in the directory. Note we need to use CRLF line endings - * in this script. -+ * -+ * XXX It would be better to use powershell here. For some ideas see -+ * https://github.com/HCK-CI/HLK-Setup-Scripts/ - *) - let firstboot_script = sprintf "\ - @echo off -@@ -299,6 +302,7 @@ if not exist \"%%scripts_done%%\" ( - mkdir \"%%scripts_done%%\" - ) - -+:: Pick the next script to run. - for %%%%f in (\"%%scripts%%\"\\*.bat) do ( - echo running \"%%%%f\" - move \"%%%%f\" \"%%scripts_done%%\" -@@ -307,8 +311,17 @@ for %%%%f in (\"%%scripts%%\"\\*.bat) do ( - set elvl=!errorlevel! - echo .... exit code !elvl! - popd -+ -+ :: Reboot the computer. This is necessary to free any locked -+ :: files which may prevent later scripts from running. -+ shutdown /r /t 0 /y -+ -+ :: Exit the script (in case shutdown returns before rebooting). -+ :: On next boot, the whole firstboot service will be called again. -+ exit /b - ) - -+:: Fallthrough here if there are no scripts. - echo uninstalling firstboot service - \"%%firstboot%%\\%s\" -s firstboot uninstall - " firstboot_dir_win srvany in -diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index 92941026..587b4604 100644 ---- a/docs/virt-v2v.pod -+++ b/docs/virt-v2v.pod -@@ -1295,9 +1295,12 @@ The guest will be bootable after the offline conversion stage, but - will not yet have all necessary drivers installed to work correctly. - These will be installed automatically the first time the guest boots. - --B Take care not to interrupt the automatic driver installation --process when logging in to the guest for the first time, as this may --prevent the guest from subsequently booting correctly. -+B Windows may reboot 4 or more times the first time after -+conversion. This is required to install the required drivers, guest -+agents, remove VMware Tools, and configure the network. Take care not -+to interrupt the automatic driver installation process when logging in -+to the guest for the first time, as this may prevent the guest from -+subsequently booting correctly. - - =head3 Removing VMware Tools from Windows guests - diff --git a/0006-Translated-using-Weblate-Ukrainian.patch b/0006-Translated-using-Weblate-Ukrainian.patch new file mode 100644 index 0000000..1b42ac3 --- /dev/null +++ b/0006-Translated-using-Weblate-Ukrainian.patch @@ -0,0 +1,110 @@ +From 5b6fd116685d605207df014d693da5b5607274a8 Mon Sep 17 00:00:00 2001 +From: Yuri Chornoivan +Date: Wed, 4 Sep 2024 17:38:40 +0200 +Subject: [PATCH] Translated using Weblate (Ukrainian) + +Currently translated at 100.0% (552 of 552 strings) + +Translation: libguestfs/virt-v2v-master +Translate-URL: https://translate.fedoraproject.org/projects/libguestfs/virt-v2v-master/uk/ +--- + po/uk.po | 27 ++++++++++++--------------- + 1 file changed, 12 insertions(+), 15 deletions(-) + +diff --git a/po/uk.po b/po/uk.po +index 8b616872..7c688b5b 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -15,9 +15,8 @@ msgstr "" + "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug." + "cgi?component=libguestfs&product=Virtualization+Tools\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" +-"PO-Revision-Date: 2024-09-03 14:41+0000\n" +-"Last-Translator: Weblate Translation Memory \n" ++"PO-Revision-Date: 2024-09-04 15:38+0000\n" ++"Last-Translator: Yuri Chornoivan \n" + "Language-Team: Ukrainian \n" + "Language: uk\n" +@@ -1272,7 +1271,7 @@ msgstr "Встановити назву програми" + + #: common/mlcustomize/customize_cmdline.ml:368 + msgid "Set root password" +-msgstr "Встановлення пароля root" ++msgstr "Встановити пароль root" + + #: common/mlcustomize/customize_cmdline.ml:444 + msgid "Set the default timezone" +@@ -1781,7 +1780,7 @@ msgstr "" + + #: common/mltools/curl.ml:82 + msgid "downloading %s" +-msgstr "Отримуємо: %s" ++msgstr "отримуємо %s" + + #: lib/networks.ml:84 + msgid "" +@@ -1829,10 +1828,8 @@ msgid "exception: %s" + msgstr "виключення: %s" + + #: common/mltools/tools_utils.ml:455 +-#, fuzzy +-#| msgid "%s exited with error status %d" + msgid "exited with error %d" +-msgstr "Роботу %s завершено зі станом виходу %d" ++msgstr "завершено роботу з помилкою %d" + + #: input/input_disk.ml:143 + msgid "expected >= 1 disk name on the command line" +@@ -1847,7 +1844,7 @@ msgstr "" + + #: common/mltools/tools_utils.ml:440 + msgid "external command" +-msgstr "" ++msgstr "зовнішня команда" + + #: output/output_rhv_upload.ml:275 + msgid "failed server prechecks, see earlier errors" +@@ -2124,10 +2121,8 @@ msgid "kernel %s is not under grub tree %s" + msgstr "ядро %s перебуває поза ієрархією grub %s" + + #: common/mltools/tools_utils.ml:539 common/mltools/tools_utils.ml:458 +-#, fuzzy +-#| msgid "%s killed by signal %d (%s)" + msgid "killed by signal %d" +-msgstr "Роботу %s припинено за допомогою сигналу %d (%s)" ++msgstr "припинено за допомогою сигналу %d" + + #: common/mltools/tools_utils.ml:237 + msgid "libguestfs error: %s" +@@ -2516,6 +2511,8 @@ msgid "" + "password-crypto: unknown algorithm %s, use \"md5\", \"sha256\", \"sha512\" " + "or \"yescrypt\"" + msgstr "" ++"password-crypto: невідомий алгоритм %s, скористайтеся \"md5\", \"sha256\", " ++"\"sha512\" або \"yescrypt\"" + + #: common/mlcustomize/password.ml:196 + msgid "" +@@ -2663,10 +2660,8 @@ msgid "ssh-inject: the user %s does not exist on the guest" + msgstr "" + + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 +-#, fuzzy +-#| msgid "%s stopped by signal %d (%s)" + msgid "stopped by signal %d" +-msgstr "Роботу %s завершено за допомогою сигналу %d (%s)" ++msgstr "завершено за допомогою сигналу %d" + + #: output/changeuid.ml:58 + msgid "subprocess exited with non-zero error code %d" +@@ -2873,6 +2868,8 @@ msgstr "" + #: common/mlcustomize/timezone.ml:35 + msgid "timezone '%s' does not exist, use a location like 'Europe/London'" + msgstr "" ++"часового поясу «%s» не існує, скористайтеся зазначенням міста, наприклад '" ++"Europe/London'" + + #: common/mlcustomize/customize_run.ml:349 + msgid "timezone could not be set for this type of guest" diff --git a/0007-Translated-using-Weblate-Ukrainian.patch b/0007-Translated-using-Weblate-Ukrainian.patch new file mode 100644 index 0000000..e3951db --- /dev/null +++ b/0007-Translated-using-Weblate-Ukrainian.patch @@ -0,0 +1,181 @@ +From 33717800c6612bc1676c670ac2f9e0c5bb06fb78 Mon Sep 17 00:00:00 2001 +From: Weblate Translation Memory + +Date: Wed, 4 Sep 2024 17:38:40 +0200 +Subject: [PATCH] Translated using Weblate (Ukrainian) + +Currently translated at 100.0% (552 of 552 strings) + +Translation: libguestfs/virt-v2v-master +Translate-URL: https://translate.fedoraproject.org/projects/libguestfs/virt-v2v-master/uk/ +--- + po/uk.po | 53 ++++++++++++++++++++++++++++++----------------------- + 1 file changed, 30 insertions(+), 23 deletions(-) + +diff --git a/po/uk.po b/po/uk.po +index 7c688b5b..1166c04f 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -16,7 +16,8 @@ msgstr "" + "cgi?component=libguestfs&product=Virtualization+Tools\n" + "POT-Creation-Date: 2024-08-29 15:25+0100\n" + "PO-Revision-Date: 2024-09-04 15:38+0000\n" +-"Last-Translator: Yuri Chornoivan \n" ++"Last-Translator: Weblate Translation Memory \n" + "Language-Team: Ukrainian \n" + "Language: uk\n" +@@ -1940,10 +1941,14 @@ msgid "" + "command line options that involve running commands in the guest. Use --" + "firstboot scripts instead." + msgstr "" ++"процесор основної системи (%s) і архітектура гостьової системи (%s) є " ++"несумісними, отже ви не можете скористатися параметрами командного рядка, " ++"зокрема запускати програми у гостьовій системі. Замість цього слід " ++"користуватися скриптами --firstboot." + + #: common/mlcustomize/customize_run.ml:217 + msgid "hostname could not be set for this type of guest" +-msgstr "" ++msgstr "для цього типу гостьових систем не можна встановлювати назви вузла" + + #: common/mldrivers/linux_kernels.ml:340 + msgid "ignoring kernel %s in bootloader, as it does not exist." +@@ -2085,28 +2090,24 @@ msgid "invalid output stream for --machine-readable: %s" + msgstr "некоректне потік виведення для --machine-readable: %s" + + #: common/mlcustomize/password.ml:73 +-#, fuzzy +-#| msgid "invalid format for '--%s' parameter, see the man page" + msgid "invalid password selector ‘%s’; see the man page" +-msgstr "некоректний формат параметра «--%s», див. сторінку підручника" ++msgstr "некоректний варіант пароля «%s»; див. сторінку man" + + #: input/OVA.ml:450 + msgid "invalid size returned by tar: %S" + msgstr "tar повернуто некоректний розмір: %S" + + #: common/mlcustomize/subscription_manager.ml:54 +-#, fuzzy +-#| msgid "invalid format for '--%s' parameter, see the man page" + msgid "invalid sm-attach selector ‘%s’; see the man page" +-msgstr "некоректний формат параметра «--%s», див. сторінку підручника" ++msgstr "некоректний варіант sm-attach «%s»; див. сторінку man" + + #: common/mlcustomize/subscription_manager.ml:41 + msgid "invalid sm-credentials selector ‘%s’; see the man page" +-msgstr "" ++msgstr "некоректний варіант sm-credentials «%s»; див. сторінку man" + + #: common/mlcustomize/ssh_key.ml:45 + msgid "invalid ssh-inject selector ‘%s’; see the man page" +-msgstr "" ++msgstr "некоректний варіант ssh-inject «%s»; див. сторінку man" + + #: input/OVF.ml:82 + msgid "invalid vmw:CoresPerSocket (%d) ignored" +@@ -2137,10 +2138,8 @@ msgstr "" + "для виконання перетворення virt-v2v" + + #: common/mlcustomize/customize_run.ml:47 +-#, fuzzy +-#| msgid "%s (ignored)" + msgid "log file %s: %s (ignored)" +-msgstr "%s (проігноровано)" ++msgstr "файл журналу %s: %s (проігноровано)" + + #: input/OVA.ml:147 + msgid "" +@@ -2188,6 +2187,8 @@ msgid "" + "multiple --root-password/--password options set the password for user ‘%s’ " + "twice" + msgstr "" ++"параметрами --root-password/--password двічі встановлено пароль для " ++"користувача «%s»" + + #: v2v/v2v.ml:704 + msgid "nbdcopy command failed, see earlier error messages" +@@ -2520,10 +2521,14 @@ msgid "" + "version %d.%d.\n" + "If this is incorrect, use --password-crypto option and file a bug." + msgstr "" ++"пароль: використано незахищене шифрування пароля md5 для гостьової системи " ++"типу %s, версія %d.%d.\n" ++"Якщо це не так, скористайтеся параметром --password-crypto і створіть " ++"повідомлення щодо вади." + + #: common/mlcustomize/customize_run.ml:404 + msgid "passwords could not be set for this type of guest" +-msgstr "" ++msgstr "для цього типу гостьових систем не можна встановлювати паролі" + + #: lib/qemuNBD.ml:125 + msgid "" +@@ -2553,6 +2558,7 @@ msgstr "qemu-nbd: неочікувана версія у --version: %s" + #: common/mlcustomize/customize_run.ml:85 + msgid "random seed could not be set for this type of guest" + msgstr "" ++"для цього типу гостьових систем не можна встановлювати базу випадковості" + + #: input/parse_domain_from_vmx.ml:45 + msgid "remote vmx ‘%s’ could not be parsed as a URI" +@@ -2639,25 +2645,23 @@ msgstr "" + + #: common/mlcustomize/ssh_key.ml:57 + msgid "ssh-inject: $HOME environment variable is not set" +-msgstr "" ++msgstr "ssh-inject: значення змінної середовища $HOME не встановлено" + + #: common/mlcustomize/ssh_key.ml:93 + msgid "ssh-inject: key is an empty string" +-msgstr "" ++msgstr "ssh-inject: ключ є порожнім рядком" + + #: common/mlcustomize/ssh_key.ml:66 +-#, fuzzy +-#| msgid "Inject a public key into the guest" + msgid "ssh-inject: no public key file found in %s" +-msgstr "Вставити відкритий ключ до гостьової системи" ++msgstr "ssh-inject: у %s не знайдено відкритого ключа" + + #: common/mlcustomize/ssh_key.ml:83 + msgid "ssh-inject: public key file (%s) is empty" +-msgstr "" ++msgstr "ssh-inject: файл відкритого ключа (%s) є порожнім" + + #: common/mlcustomize/ssh_key.ml:112 + msgid "ssh-inject: the user %s does not exist on the guest" +-msgstr "" ++msgstr "ssh-inject: запису користувача %s у гостьовій системі не існує" + + #: common/mltools/tools_utils.ml:542 common/mltools/tools_utils.ml:461 + msgid "stopped by signal %d" +@@ -2673,7 +2677,7 @@ msgstr "підпроцес надіслав сигнал або зупинив + + #: common/mlcustomize/customize_run.ml:307 + msgid "subscription-manager credentials required for --sm-register" +-msgstr "" ++msgstr "для --sm-register потрібні реєстраційні дані subscription-manager" + + #: v2v/v2v.ml:217 + msgid "the --no-trim option has been removed and now does nothing" +@@ -2701,6 +2705,9 @@ msgid "" + "the command may have failed because the network is disabled. Try either " + "removing ‘--no-network’ or adding ‘--network’ on the command line." + msgstr "" ++"спроба виконати команду могла зазнати невдачі через те, що мережу було " ++"вимкнено. Спробуйте або вилучити «--no-network» з рядка команди, або додати " ++"«--network» до нього." + + #: common/mltools/JSON_parser.ml:81 + msgid "the key ‘%s’ was not found in a list of objects" +@@ -2873,7 +2880,7 @@ msgstr "" + + #: common/mlcustomize/customize_run.ml:349 + msgid "timezone could not be set for this type of guest" +-msgstr "" ++msgstr "для цього типу гостьових систем не можна встановлювати часовий пояс" + + #: input/OVA.ml:318 + msgid "unable to parse line from manifest file: %S" diff --git a/0007-docs-Restate-position-on-removal-of-VMware-Tools.patch b/0007-docs-Restate-position-on-removal-of-VMware-Tools.patch deleted file mode 100644 index 1b25ee4..0000000 --- a/0007-docs-Restate-position-on-removal-of-VMware-Tools.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e9c0d63b22bcb4c31cfaac00fc1271713c8bd3b3 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 8 Aug 2024 10:56:16 +0100 -Subject: [PATCH] docs: Restate position on removal of VMware Tools - -With the "reboot after every step" change made in the previous commit, -it seems removal of VMware Tools is now more reliable. Update the -notes about this. - -Updates: commit c952f310c902e438a8b0b5240a4b486b698bede8 ---- - docs/virt-v2v.pod | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index 587b4604..346be606 100644 ---- a/docs/virt-v2v.pod -+++ b/docs/virt-v2v.pod -@@ -1308,9 +1308,8 @@ Virt-v2v attempts to remove VMware Tools. For Windows guests this is - supposed to happen during the first boot after conversion. - - We use VMware's recommended uninstallation method as that is the --safest choice. However our experience has shown that this method --usually fails. If so, VMware Tools must be removed by some other --method. -+safest choice. If this fails, VMware Tools must be manually removed -+by some other method. - - One possible method is described here: - L diff --git a/0008-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch b/0008-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch index 37f2692..6b59ccf 100644 --- a/0008-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch +++ b/0008-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch @@ -1,4 +1,4 @@ -From ed515103ba0d4054c7000568b39df42abb503f3c Mon Sep 17 00:00:00 2001 +From 452464fc14731dd1f4f12f62d12ad82625f63aed Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 28 Sep 2014 19:14:43 +0100 Subject: [PATCH] RHEL: v2v: Select correct qemu binary for -o qemu mode diff --git a/0009-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch b/0009-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch index 43b1290..5d027fc 100644 --- a/0009-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch +++ b/0009-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch @@ -1,4 +1,4 @@ -From 84afa8cb6933daee1585facc00557826f1fd2273 Mon Sep 17 00:00:00 2001 +From 6bc7af1eaeb3442329dd2d71ca422678b77d79aa Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Sep 2014 10:50:27 +0100 Subject: [PATCH] RHEL: v2v: Disable the --qemu-boot / -oo qemu-boot option @@ -44,10 +44,10 @@ index d2a1c270..0be37f5e 100644 =item B<-o null> diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index 346be606..81a4b45a 100644 +index e6465fbf..76067e5a 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod -@@ -146,11 +146,6 @@ Since F contains the path(s) to the guest disk +@@ -155,11 +155,6 @@ Since F contains the path(s) to the guest disk image(s) you do not need to specify the name of the disk image on the command line. @@ -59,7 +59,7 @@ index 346be606..81a4b45a 100644 =head1 OPTIONS =over 4 -@@ -522,9 +517,6 @@ This is similar to I<-o local>, except that a shell script is written +@@ -531,9 +526,6 @@ This is similar to I<-o local>, except that a shell script is written which you can use to boot the guest in qemu. The converted disks and shell script are written to the directory specified by I<-os>. @@ -69,7 +69,7 @@ index 346be606..81a4b45a 100644 =item B<-o> B This is the same as I<-o rhv>. -@@ -607,11 +599,6 @@ For I<-o openstack> (L) only, set a guest ID +@@ -616,11 +608,6 @@ For I<-o openstack> (L) only, set a guest ID which is saved on each Cinder volume in the C volume property. @@ -81,7 +81,7 @@ index 346be606..81a4b45a 100644 =item B<-oo verify-server-certificate> =item B<-oo verify-server-certificate=>C -@@ -782,10 +769,6 @@ Print information about the source guest and stop. This option is +@@ -791,10 +778,6 @@ Print information about the source guest and stop. This option is useful when you are setting up network and bridge maps. See L. @@ -107,7 +107,7 @@ index 07dae8c2..b6f24565 100644 let output_storage = match options.output_storage with diff --git a/v2v/v2v.ml b/v2v/v2v.ml -index 48c8cfba..fca5f6e9 100644 +index 194e6233..6baa111f 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -277,8 +277,6 @@ let rec main () = diff --git a/0010-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch b/0010-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch index a4ce757..d1b44d4 100644 --- a/0010-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch +++ b/0010-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch @@ -1,4 +1,4 @@ -From abab56cf74a5005b33e962bb3d42db3d5b39e6d3 Mon Sep 17 00:00:00 2001 +From 145377b0aa47c2fbab0448ddd0e06d7a39b7f25d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 24 Apr 2015 09:45:41 -0400 Subject: [PATCH] RHEL: Fix list of supported sound cards to match RHEL qemu diff --git a/0011-RHEL-Fixes-for-libguestfs-winsupport.patch b/0011-RHEL-Fixes-for-libguestfs-winsupport.patch index 79efbc5..e0b7d45 100644 --- a/0011-RHEL-Fixes-for-libguestfs-winsupport.patch +++ b/0011-RHEL-Fixes-for-libguestfs-winsupport.patch @@ -1,4 +1,4 @@ -From 2039580744223840a09b8aab7ff2fbf94a563a6c Mon Sep 17 00:00:00 2001 +From 628515f144017e3ac787a5daa3f76d0e3b0b47f6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 30 Aug 2015 03:21:57 -0400 Subject: [PATCH] RHEL: Fixes for libguestfs-winsupport. @@ -18,10 +18,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=2187961#c1 6 files changed, 28 insertions(+), 4 deletions(-) diff --git a/convert/convert.ml b/convert/convert.ml -index 344c5858..ecc48ad4 100644 +index 64b36c97..604902d1 100644 --- a/convert/convert.ml +++ b/convert/convert.ml -@@ -52,6 +52,7 @@ let rec convert dir options source = +@@ -53,6 +53,7 @@ let rec convert dir options source = message (f_"Opening the source"); let g = open_guestfs ~identifier:"v2v" () in @@ -30,7 +30,7 @@ index 344c5858..ecc48ad4 100644 (* Setting the number of vCPUs allows parallel mkinitrd, but make * sure this is not too large because each vCPU consumes guest RAM. diff --git a/test-data/phony-guests/make-windows-img.sh b/test-data/phony-guests/make-windows-img.sh -index 30908a91..73cf5144 100755 +index 501c2a93..28b2744f 100755 --- a/test-data/phony-guests/make-windows-img.sh +++ b/test-data/phony-guests/make-windows-img.sh @@ -37,6 +37,7 @@ fi @@ -85,7 +85,7 @@ index 4373f140..2b31b0bb 100755 # Test the base image remained untouched diff --git a/tests/test-v2v-virtio-win-iso.sh b/tests/test-v2v-virtio-win-iso.sh -index 69f6f414..b9b806fb 100755 +index 68fb879b..2e133034 100755 --- a/tests/test-v2v-virtio-win-iso.sh +++ b/tests/test-v2v-virtio-win-iso.sh @@ -82,6 +82,12 @@ mktest () diff --git a/0012-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch b/0012-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch index 294a172..0d41e85 100644 --- a/0012-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch +++ b/0012-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch @@ -1,4 +1,4 @@ -From 13970ce5d6be475cf6e06185636a730584303a6e Mon Sep 17 00:00:00 2001 +From f9fda69fae36c1b39bc150f79ffff70540b5d666 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 2 Mar 2017 14:21:37 +0100 Subject: [PATCH] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671) diff --git a/0013-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch b/0013-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch index 0f65b16..97975e5 100644 --- a/0013-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch +++ b/0013-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch @@ -1,4 +1,4 @@ -From 98a14fe2f8a428ed4bba85aba3889467d48a5743 Mon Sep 17 00:00:00 2001 +From edb28ecefc3f2ee2a5135dd5becfebfc9e408a2c Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Wed, 8 Mar 2017 11:03:40 +0100 Subject: [PATCH] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203) diff --git a/0014-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch b/0014-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch index 49acc96..0b67d19 100644 --- a/0014-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch +++ b/0014-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch @@ -1,4 +1,4 @@ -From be45d1e5bca42148c295da10c27c485c72de28c3 Mon Sep 17 00:00:00 2001 +From 7d62ecb6fb9376e1d4950a8f98b53c79a05d3a1a Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 26 Mar 2019 09:42:25 +0100 Subject: [PATCH] RHEL: point to KB for supported v2v hypervisors/guests diff --git a/0015-RHEL-Disable-o-glance.patch b/0015-RHEL-Disable-o-glance.patch index 7ae9f69..9827a55 100644 --- a/0015-RHEL-Disable-o-glance.patch +++ b/0015-RHEL-Disable-o-glance.patch @@ -1,4 +1,4 @@ -From b0386851d539e414302cb646567836717fd027d9 Mon Sep 17 00:00:00 2001 +From 09a597d694e6d90fe49d11ceb5faf41981af7d1f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 30 Jun 2021 11:15:52 +0100 Subject: [PATCH] RHEL: Disable -o glance @@ -98,10 +98,10 @@ index cd4862b1..54cd276e 100644 =head1 AUTHOR diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index 81a4b45a..7c7069df 100644 +index 76067e5a..25327366 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod -@@ -435,14 +435,6 @@ See L below. +@@ -444,14 +444,6 @@ See L below. This is the same as I<-o local>. @@ -116,7 +116,7 @@ index 81a4b45a..7c7069df 100644 =item B<-o> B Set the output method to I. B (or F). @@ -128,7 +128,7 @@ index 81a4b45a..7c7069df 100644 =item I<-o local> =item I<-o qemu> -@@ -1398,13 +1385,6 @@ See also L. +@@ -1411,13 +1398,6 @@ See also L. Because of how Cinder volumes are presented as F block devices, using I<-o openstack> normally requires that virt-v2v is run as root. @@ -167,7 +167,7 @@ index c0db9115..074b5e16 100755 set -e set -x diff --git a/v2v/v2v.ml b/v2v/v2v.ml -index fca5f6e9..4148fa50 100644 +index 6baa111f..427d35d4 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -197,7 +197,6 @@ let rec main () = @@ -187,7 +187,7 @@ index fca5f6e9..4148fa50 100644 s_"Set output mode (default: libvirt)"; [ M"oa" ], Getopt.String ("sparse|preallocated", set_output_alloc), s_"Set output allocation mode"; -@@ -325,8 +324,6 @@ virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp +@@ -333,8 +332,6 @@ virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp virt-v2v -i disk disk.img -o local -os /var/tmp @@ -196,7 +196,7 @@ index fca5f6e9..4148fa50 100644 There is a companion front-end called \"virt-p2v\" which comes as an ISO or CD image that can be booted on physical machines. -@@ -401,7 +398,6 @@ read the man page virt-v2v(1). +@@ -412,7 +409,6 @@ read the man page virt-v2v(1). pr "input:libvirtxml\n"; pr "input:ova\n"; pr "input:vmx\n"; @@ -204,7 +204,7 @@ index fca5f6e9..4148fa50 100644 pr "output:kubevirt\n"; pr "output:libvirt\n"; pr "output:local\n"; -@@ -498,7 +494,6 @@ read the man page virt-v2v(1). +@@ -509,7 +505,6 @@ read the man page virt-v2v(1). | `Disk -> (module Output_disk.Disk) | `Null -> (module Output_null.Null) | `QEmu -> (module Output_qemu.QEMU) diff --git a/0016-RHEL-Remove-the-in-place-option.patch b/0016-RHEL-Remove-the-in-place-option.patch index 11900a6..7dd9256 100644 --- a/0016-RHEL-Remove-the-in-place-option.patch +++ b/0016-RHEL-Remove-the-in-place-option.patch @@ -1,4 +1,4 @@ -From 7cbdcc0d3acf0bc50e331ad994987c26c5917b63 Mon Sep 17 00:00:00 2001 +From f2d4730d75f513c9b30bbe57a2ab1c38975d8286 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 2 Dec 2021 11:56:05 +0000 Subject: [PATCH] RHEL: Remove the --in-place option @@ -12,10 +12,10 @@ wish to support in RHEL. 3 files changed, 17 deletions(-) diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index 7c7069df..9da6c851 100644 +index 25327366..6a0b55e1 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod -@@ -24,9 +24,6 @@ virtualize those machines (physical to virtual, or p2v). +@@ -25,9 +25,6 @@ virtualize those machines (physical to virtual, or p2v). To estimate the disk space needed before conversion, see L. @@ -25,7 +25,7 @@ index 7c7069df..9da6c851 100644 =head2 Input and Output You normally run virt-v2v with several I<-i*> options controlling the -@@ -39,10 +36,6 @@ The input and output sides of virt-v2v are separate and unrelated. +@@ -40,10 +37,6 @@ The input and output sides of virt-v2v are separate and unrelated. Virt-v2v can read from any input and write to any output. Therefore these sides of virt-v2v are documented separately in this manual. @@ -33,10 +33,10 @@ index 7c7069df..9da6c851 100644 -mode". In this case the source guest is always left unchanged. -In-place conversions may be done using L. - - =head2 Other virt-v2v topics + =head2 Customization - L — Supported hypervisors, virtualization -@@ -1666,7 +1659,6 @@ L, L, @@ -45,7 +45,7 @@ index 7c7069df..9da6c851 100644 L, L, diff --git a/tests/Makefile.am b/tests/Makefile.am -index 723a6506..4bfa1c7a 100644 +index 1c3d6064..cee516c4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -77,7 +77,6 @@ TESTS = \ @@ -57,7 +57,7 @@ index 723a6506..4bfa1c7a 100644 test-v2v-inspector.sh \ test-v2v-mac.sh \ diff --git a/v2v/v2v.ml b/v2v/v2v.ml -index 4148fa50..834f023d 100644 +index 427d35d4..3604e396 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -219,12 +219,6 @@ let rec main () = diff --git a/0017-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch b/0017-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch index 4ebf937..fd20453 100644 --- a/0017-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch +++ b/0017-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch @@ -1,4 +1,4 @@ -From f98822497a4a60a56cb4da2d5609d30150bdd718 Mon Sep 17 00:00:00 2001 +From e07412b5de82dc27e99eae72da8b3d0b63d3d7aa Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 5 Jul 2022 11:56:54 +0100 Subject: [PATCH] RHEL 9: -oo compressed: Remove nbdcopy version check and test @@ -34,7 +34,7 @@ index 53d4bb1b..14288bdc 100644 let g = open_guestfs () in diff --git a/tests/Makefile.am b/tests/Makefile.am -index 4bfa1c7a..f38342f0 100644 +index cee516c4..e4c5cdb9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -86,7 +86,6 @@ TESTS = \ diff --git a/0018-RHEL-9-tests-Remove-btrfs-test.patch b/0018-RHEL-9-tests-Remove-btrfs-test.patch index 6c1fdfb..44d4097 100644 --- a/0018-RHEL-9-tests-Remove-btrfs-test.patch +++ b/0018-RHEL-9-tests-Remove-btrfs-test.patch @@ -1,4 +1,4 @@ -From 28311593d57777fd4d19a9ce93b4b06502a154be Mon Sep 17 00:00:00 2001 +From fa908f4ba62015ffddbae48e0e4d8c8285027f4a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 5 Jul 2022 11:58:09 +0100 Subject: [PATCH] RHEL 9: tests: Remove btrfs test @@ -9,7 +9,7 @@ RHEL does not have btrfs so this test always fails. 1 file changed, 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index f38342f0..810b5b50 100644 +index e4c5cdb9..fc846ee7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -100,7 +100,6 @@ TESTS = \ diff --git a/0019-RHEL-9-Remove-block-driver-option.patch b/0019-RHEL-9-Remove-block-driver-option.patch index c2711e7..c8aa449 100644 --- a/0019-RHEL-9-Remove-block-driver-option.patch +++ b/0019-RHEL-9-Remove-block-driver-option.patch @@ -1,4 +1,4 @@ -From 9b289e8d0f03c9d98d2b950feb889cad883779ea Mon Sep 17 00:00:00 2001 +From 54e64cee82ad660b6cdc286b6b83e31311049d3e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 28 Apr 2023 12:28:19 +0100 Subject: [PATCH] RHEL 9: Remove --block-driver option @@ -16,10 +16,10 @@ Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2190387 5 files changed, 2 insertions(+), 41 deletions(-) diff --git a/docs/virt-v2v-in-place.pod b/docs/virt-v2v-in-place.pod -index ce57e229..6e1c5363 100644 +index 4304c0d6..b7384210 100644 --- a/docs/virt-v2v-in-place.pod +++ b/docs/virt-v2v-in-place.pod -@@ -47,16 +47,6 @@ Display help. +@@ -51,16 +51,6 @@ Display help. See I<--network> below. @@ -37,10 +37,10 @@ index ce57e229..6e1c5363 100644 =item B<--colours> diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index 9da6c851..d3406be0 100644 +index 6a0b55e1..b816256f 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod -@@ -197,16 +197,6 @@ The options are silently ignored for other input methods. +@@ -206,16 +206,6 @@ The options are silently ignored for other input methods. See I<--network> below. @@ -58,7 +58,7 @@ index 9da6c851..d3406be0 100644 =item B<--colours> diff --git a/in-place/in_place.ml b/in-place/in_place.ml -index 1fbd29d3..1c690a54 100644 +index 8286dbc5..2dc406e2 100644 --- a/in-place/in_place.ml +++ b/in-place/in_place.ml @@ -43,7 +43,6 @@ let rec main () = @@ -78,7 +78,7 @@ index 1fbd29d3..1c690a54 100644 [ S 'i' ], Getopt.String ("disk|libvirt|libvirtxml|ova|vmx", set_input_mode), s_"Set input mode (default: libvirt)"; [ M"ic" ], Getopt.String ("uri", set_string_option_once "-ic" input_conn), -@@ -216,12 +213,6 @@ read the man page virt-v2v-in-place(1). +@@ -225,12 +222,6 @@ read the man page virt-v2v-in-place(1). (* Dereference the arguments. *) let args = List.rev !args in @@ -88,10 +88,10 @@ index 1fbd29d3..1c690a54 100644 - | Some "virtio-scsi" -> Virtio_SCSI - | Some driver -> - error (f_"unknown block driver ‘--block-driver %s’") driver in + let customize_ops = get_customize_ops () in let input_conn = !input_conn in let input_mode = !input_mode in - let print_source = !print_source in -@@ -305,7 +296,7 @@ read the man page virt-v2v-in-place(1). +@@ -316,7 +307,7 @@ read the man page virt-v2v-in-place(1). (* Get the conversion options. *) let conv_options = { @@ -101,7 +101,7 @@ index 1fbd29d3..1c690a54 100644 ks = opthandle.ks; network_map; diff --git a/tests/Makefile.am b/tests/Makefile.am -index 810b5b50..03c71882 100644 +index fc846ee7..8a710b99 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -77,7 +77,6 @@ TESTS = \ @@ -113,7 +113,7 @@ index 810b5b50..03c71882 100644 test-v2v-mac.sh \ test-v2v-machine-readable.sh \ diff --git a/v2v/v2v.ml b/v2v/v2v.ml -index 834f023d..be5a66e2 100644 +index 3604e396..2fdaf40b 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -48,7 +48,6 @@ let rec main () = @@ -133,7 +133,7 @@ index 834f023d..be5a66e2 100644 [ L"compressed" ], Getopt.Unit (fun () -> set_output_option_compat "compressed" ""), s_"Compress output file (-of qcow2 only)"; [ S 'i' ], Getopt.String ("disk|libvirt|libvirtxml|ova|vmx", set_input_mode), -@@ -343,12 +340,6 @@ read the man page virt-v2v(1). +@@ -352,12 +349,6 @@ read the man page virt-v2v(1). (* Dereference the arguments. *) let args = List.rev !args in @@ -143,10 +143,10 @@ index 834f023d..be5a66e2 100644 - | Some "virtio-scsi" -> Virtio_SCSI - | Some driver -> - error (f_"unknown block driver ‘--block-driver %s’") driver in + let customize_ops = get_customize_ops () in let input_conn = !input_conn in let input_mode = !input_mode in - let input_transport = -@@ -520,7 +511,7 @@ read the man page virt-v2v(1). +@@ -531,7 +522,7 @@ read the man page virt-v2v(1). (* Get the conversion options. *) let conv_options = { diff --git a/0020-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch b/0020-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch index a327e4a..06aceea 100644 --- a/0020-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch +++ b/0020-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch @@ -1,4 +1,4 @@ -From 1dec94e52974e45fd3962dcbd51882fde7e9c306 Mon Sep 17 00:00:00 2001 +From ae82e49e7ae4780aae866a144859f54a8e339c18 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 9 Jul 2024 11:30:09 +0100 Subject: [PATCH] RHEL: Add warning about virt-v2v-in-place not being supported @@ -9,10 +9,10 @@ Fixes: https://issues.redhat.com/browse/RHEL-40903 1 file changed, 3 insertions(+) diff --git a/in-place/in_place.ml b/in-place/in_place.ml -index 1c690a54..a70e812b 100644 +index 2dc406e2..9d24de78 100644 --- a/in-place/in_place.ml +++ b/in-place/in_place.ml -@@ -197,6 +197,9 @@ read the man page virt-v2v-in-place(1). +@@ -206,6 +206,9 @@ read the man page virt-v2v-in-place(1). let opthandle = create_standard_options argspec ~anon_fun ~key_opts:true ~machine_readable:true usage_msg in Getopt.parse opthandle.getopt; diff --git a/0021-convert-windows-Online-all-virtio-disks-at-first-boo.patch b/0021-convert-windows-Online-all-virtio-disks-at-first-boo.patch deleted file mode 100644 index 8050e62..0000000 --- a/0021-convert-windows-Online-all-virtio-disks-at-first-boo.patch +++ /dev/null @@ -1,93 +0,0 @@ -From d26ed76801f9d3ce5d3863ca09dfa653b4bcd1b2 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 27 Aug 2024 12:36:41 +0100 -Subject: [PATCH] convert: windows: Online all virtio disks at first boot - -Windows 2022 (and possibly earlier versions back to around 2019) will -force offline any non-boot disks which change bus, apparently as a -security mitigation. The effect of this is that although the system -drive (C:) is present after conversion, other drives may seem to -disappear. - -Running a Powershell script to bring all disks online seems risky. -The compromise is to bring online only virtio disks at first boot. - -To further reduce risk, we only do this if there are non-system disks -(ie. > 1 disks in total), and only if we installed virtio drivers. - -Fixes: https://issues.redhat.com/browse/RHEL-55763 -Fixes: https://issues.redhat.com/browse/RHEL-55837 -Related: https://issues.redhat.com/browse/MTV-1299 -Related: https://bugzilla.redhat.com/show_bug.cgi?id=1662286 -Signed-off-by: Richard W.M. Jones -Thanks: Martin Necas -Acked-by: Martin Necas -(cherry picked from commit cb56f6f94dc153051515fc7aa0d9ca646f5e2340) ---- - convert/convert_windows.ml | 39 +++++++++++++++++++++++++++++++++++++- - 1 file changed, 38 insertions(+), 1 deletion(-) - -diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml -index 52ca5bbe..352e1218 100644 ---- a/convert/convert_windows.ml -+++ b/convert/convert_windows.ml -@@ -38,7 +38,8 @@ module G = Guestfs - * time the Windows VM is booted on KVM. - *) - --let convert (g : G.guestfs) _ inspect i_firmware block_driver _ static_ips = -+let convert (g : G.guestfs) source inspect i_firmware -+ block_driver _ static_ips = - (*----------------------------------------------------------------------*) - (* Inspect the Windows guest. *) - -@@ -272,6 +273,8 @@ let convert (g : G.guestfs) _ inspect i_firmware block_driver _ static_ips = - Registry.with_hive_write g inspect.i_windows_software_hive - update_software_hive; - -+ configure_online_disks block_driver; -+ - configure_network_interfaces net_driver; - - fix_ntfs_heads (); -@@ -668,6 +671,40 @@ let convert (g : G.guestfs) _ inspect i_firmware block_driver _ static_ips = - warning (f_"could not find registry key \ - HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion") - -+ and configure_online_disks block_driver = -+ (* If there are > 1 disks, run a script which will force Windows -+ * to bring them all online. Windows 2022 will offline non-boot disks -+ * where the bus changes as some sort of "security" mitigation. -+ * https://issues.redhat.com/browse/RHEL-55837 -+ * https://issues.redhat.com/browse/MTV-1299 -+ * https://bugzilla.redhat.com/show_bug.cgi?id=1662286 -+ *) -+ let virtio_installed = -+ match block_driver with -+ | Inject_virtio_win.Virtio_blk | Virtio_SCSI -> true -+ | IDE -> false in -+ let more_than_one_disk = List.length source.s_disks > 1 in -+ -+ if virtio_installed && more_than_one_disk then ( -+ let psh_filename = "online-disks" in -+ let psh = ref [] in -+ let add = List.push_back psh in -+ -+ add "# Uncomment this line for lots of debug output."; -+ add "# Set-PSDebug -Trace 1"; -+ add ""; -+ add "Write-Host \"Online all virtio disks\""; -+ add ""; -+ add "Get-Disk | Where { $_.FriendlyName -like '*VirtIO*' } | % {"; -+ add " Write-Host (' - ' + $_.Number + ': ' + $_.FriendlyName + '(' + [math]::Round($_.Size/1GB,2) + 'GB)')"; -+ add " $_ | Set-Disk -IsOffline $false"; -+ add " $_ | Set-Disk -IsReadOnly $false"; -+ add "}"; -+ -+ (* Install the Powershell script to run late at firstboot. *) -+ Firstboot.add_firstboot_powershell g inspect.i_root psh_filename !psh -+ ) -+ - and configure_network_interfaces net_driver = - (* If we were asked to force network interfaces to have particular - * static IP addresses then it is done here by installing a diff --git a/copy-patches.sh b/copy-patches.sh index f69928f..bca1935 100755 --- a/copy-patches.sh +++ b/copy-patches.sh @@ -7,7 +7,7 @@ set -e # ./copy-patches.sh project=virt-v2v -rhel_version=9.5 +rhel_version=9.6 # Check we're in the right directory. if [ ! -f $project.spec ]; then diff --git a/sources b/sources index 8cd4356..80b1d9e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.5.6.tar.gz) = 86cc41042518d1ea62627c6fa0605f42dcc397e7ddc3c549bcdc3f54e3703426c14f8b42e102483afb0fad818ff569e1440042c624e9fecf3d04f14233b7a3f5 -SHA512 (virt-v2v-2.5.6.tar.gz.sig) = 39d7fcdb88b1abe325b3f3c2e8bda506fb8ecf41d5adb09e7c6bcd84f881cb73a897c1556735c49e420955ae0cc79614c42930495088d8ae6a3bc0cf39ff93f9 +SHA512 (virt-v2v-2.5.9.tar.gz) = 93c557439f69e1ab75ad7caf6bd42e3877aff9454f844dad99d9296bbc2caa45a319ae5688c8f184acd5702cd7e732627591db2ff39292af62a6f61bba76d597 +SHA512 (virt-v2v-2.5.9.tar.gz.sig) = 2d687146ad6d6c3ab9791ac5c064f4f6cfb97209e08a081c51104bf9c3aba5cb9e00689692fd70831caa5c6405b40e5e67b8f4f92ec95200ac3d97dd4c3ce298 diff --git a/virt-v2v.spec b/virt-v2v.spec index 2f9b12e..86d5549 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,8 +7,8 @@ Name: virt-v2v Epoch: 1 -Version: 2.5.6 -Release: 5%{?dist} +Version: 2.5.9 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -25,16 +25,16 @@ Source2: libguestfs.keyring Source3: copy-patches.sh # Patches are maintained in the following repository: -# https://github.com/libguestfs/virt-v2v/commits/rhel-9.5 +# https://github.com/libguestfs/virt-v2v/commits/rhel-9.6 # Patches. -Patch0001: 0001-docs-Note-that-mac-len-field-is-now-optional.patch -Patch0002: 0002-convert-More-robust-qemu-ga-installation-change-path.patch -Patch0003: 0003-common-mlcustomize-Inject-qemu-ga-blnsvr-into-firstb.patch -Patch0004: 0004-docs-Add-a-note-about-removal-of-VMware-Tools-on-Win.patch -Patch0005: 0005-Update-common-submodule.patch -Patch0006: 0006-Pull-in-a-fix-to-make-Windows-firstboot-more-reliabl.patch -Patch0007: 0007-docs-Restate-position-on-removal-of-VMware-Tools.patch +Patch0001: 0001-convert-Display-osinfo-in-Converting-.-message.patch +Patch0002: 0002-Translated-using-Weblate-English-United-Kingdom.patch +Patch0003: 0003-Update-translation-files.patch +Patch0004: 0004-Translated-using-Weblate-Ukrainian.patch +Patch0005: 0005-Translated-using-Weblate-Ukrainian.patch +Patch0006: 0006-Translated-using-Weblate-Ukrainian.patch +Patch0007: 0007-Translated-using-Weblate-Ukrainian.patch Patch0008: 0008-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch Patch0009: 0009-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch Patch0010: 0010-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch @@ -48,7 +48,6 @@ Patch0017: 0017-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch Patch0018: 0018-RHEL-9-tests-Remove-btrfs-test.patch Patch0019: 0019-RHEL-9-Remove-block-driver-option.patch Patch0020: 0020-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch -Patch0021: 0021-convert-windows-Online-all-virtio-disks-at-first-boo.patch %if !0%{?rhel} # libguestfs hasn't been built on i686 for a while since there is no @@ -352,7 +351,12 @@ make -C tests TESTS=test-v2v-fedora-luks-on-lvm-conversion.sh check %changelog -* Thu Aug 29 2024 Richard W.M. Jones - 1:2.5.6-5 +* Thu Sep 05 2024 Richard W.M. Jones - 1:2.5.9-1 +- Rebase to upstream development version 2.5.9 +- Fix display of incorrect Windows 11 version + resolves: RHEL-56784 +- Add customization options for post-conversion modification + resolves: RHEL-55761 - convert: windows: Ignore sriov drivers on virtio-win disk resolves: RHEL-56383