[Pkg-libvirt-commits] [libguestfs] 09/10: Version 1.29.40.
Hilko Bengen
bengen at moszumanska.debian.org
Sun Nov 1 17:11:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag upstream/1.29.40
in repository libguestfs.
commit dcd382d9d4ad8b063c73fd35c9ffd8d609ee98b8
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Wed May 6 17:10:07 2015 +0100
Version 1.29.40.
---
BUGS | 83 +++++++++++---------
configure.ac | 2 +-
po-docs/libguestfs-docs.pot | 4 +-
po/de.po | 184 ++++++++++++++++++++++++++++----------------
po/en_GB.po | 179 ++++++++++++++++++++++++++----------------
po/es.po | 179 ++++++++++++++++++++++++++----------------
po/eu.po | 179 ++++++++++++++++++++++++++----------------
po/fr.po | 179 ++++++++++++++++++++++++++----------------
po/gu.po | 179 ++++++++++++++++++++++++++----------------
po/hi.po | 179 ++++++++++++++++++++++++++----------------
po/ja.po | 179 ++++++++++++++++++++++++++----------------
po/kn.po | 179 ++++++++++++++++++++++++++----------------
po/libguestfs.pot | 181 +++++++++++++++++++++++++++----------------
po/ml.po | 179 ++++++++++++++++++++++++++----------------
po/mr.po | 179 ++++++++++++++++++++++++++----------------
po/nl.po | 179 ++++++++++++++++++++++++++----------------
po/or.po | 179 ++++++++++++++++++++++++++----------------
po/pa.po | 179 ++++++++++++++++++++++++++----------------
po/pl.po | 179 ++++++++++++++++++++++++++----------------
po/ru.po | 179 ++++++++++++++++++++++++++----------------
po/ta.po | 179 ++++++++++++++++++++++++++----------------
po/te.po | 179 ++++++++++++++++++++++++++----------------
po/tg.po | 179 ++++++++++++++++++++++++++----------------
po/uk.po | 184 ++++++++++++++++++++++++++++----------------
po/zh_CN.po | 179 ++++++++++++++++++++++++++----------------
po/zh_TW.po | 179 ++++++++++++++++++++++++++----------------
26 files changed, 2634 insertions(+), 1584 deletions(-)
diff --git a/BUGS b/BUGS
index 16583c5..1eee249 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2015-05-02
+Last updated: 2015-05-06
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
@@ -53,9 +53,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
813290 NEW https://bugzilla.redhat.com/show_bug.cgi?id=813290
mdadm (md-detail) test occasionally fails with 'md device /dev/md125 does not appear to be active.'
-823758 NEW https://bugzilla.redhat.com/show_bug.cgi?id=823758
- p2v client should have largest number restrictions for CPU and Memory settings
-
824021 NEW https://bugzilla.redhat.com/show_bug.cgi?id=824021
inspection cannot recognize guest which uses btrfs subvolumes for root
@@ -92,9 +89,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
887826 NEW https://bugzilla.redhat.com/show_bug.cgi?id=887826
RFE: virt-sparsify cannot handle multi-disk virtual machines (eg. if they use LVM, MD, LDM, etc)
-889082 NEW https://bugzilla.redhat.com/show_bug.cgi?id=889082
- [RFE]virt-p2v should check whether guest with same name exist on target first then transfer the disk
-
891909 NEW https://bugzilla.redhat.com/show_bug.cgi?id=891909
Can't make install with non-standard prefix as non-root
@@ -359,9 +353,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1167916 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1167916
P2V error:unexpected end of file waiting for password prompt.
-1167921 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1167921
- p2v: No Network Connection dialog
-
1167922 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1167922
p2v: No virtual console
@@ -500,6 +491,15 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1216305 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1216305
virt-inspector fails to detect the rhel7 images
+1217959 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1217959
+ journal logging support
+
+1218766 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1218766
+ Rebase libguestfs in RHEL 7.3
+
+1218934 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1218934
+ virt-sparsify: read all the output from 'qemu-img --help'
+
503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
guestfish's list splitting does not recognize internal quoting
@@ -554,6 +554,9 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1156298 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1156298
Remove files in package libguestfs-bash-completion, these files are bash completion files, some of the virt tool completion are already implement in another file, so can remove its completion file
+1164708 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1164708
+ set-label can only set <=127 bytes for btrfs and <=126 bytes for ntfs filesystem which not meet the help message. Also for ntfs it should give a warning message when the length >128 bytes
+
1177910 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1177910
Libguestfs fails to locate the qemu-kvm on POWER8(BE) host.
@@ -563,15 +566,24 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1211996 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1211996
virt-inspector gives incorrect arch (ppc64) for ppc64le guest
-(181 bugs)
+(182 bugs)
--------------------------------------------------
Bugs in MODIFIED, POST or ON_QA state are fixed.
You can help by testing the fixes.
+823758 POST https://bugzilla.redhat.com/show_bug.cgi?id=823758
+ p2v client should have largest number restrictions for CPU and Memory settings
+
+889082 POST https://bugzilla.redhat.com/show_bug.cgi?id=889082
+ [RFE] virt-v2v should check whether guest with same name exist on target first then transfer the disk
+
1028650 POST https://bugzilla.redhat.com/show_bug.cgi?id=1028650
virt-* argument parser doesn't accept --arg=value (you have to use --arg value)
+1167921 POST https://bugzilla.redhat.com/show_bug.cgi?id=1167921
+ p2v: No Network Connection dialog
+
1194472 POST https://bugzilla.redhat.com/show_bug.cgi?id=1194472
Current virt-builder index breaks version < 1.26
@@ -587,9 +599,6 @@ You can help by testing the fixes.
1159030 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1159030
libvirt backend does not set RBD password
-1164708 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1164708
- set-label can only set <=127 bytes for btrfs and <=126 bytes for ntfs filesystem which not meet the help message. Also for ntfs it should give a warning message when the length >128 bytes
-
1165564 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1165564
Provide Reboot/Shutdown button after virt-p2v
@@ -611,12 +620,6 @@ You can help by testing the fixes.
1174200 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1174200
New virt-v2v failure: CURL: Error opening file: NSS: client certificate not found (nickname not specified): Invalid argument
-1175196 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1175196
- "parse-environment" and "parse-environment-list" fail to parse "LIBGUESTFS_TRACE = 0"
-
-1175676 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1175676
- Typo error in 'help ping-daemon'
-
1176493 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1176493
virt-v2v ignores sound device when convert xen guest to local kvm
@@ -626,28 +629,13 @@ You can help by testing the fixes.
1176598 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1176598
virt-v2v -o vdsm write ovf to specify domain
-1182463 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1182463
- "mknod-b", "mknod-c", and "mkfifo" do not strip non-permissions bits from "mode"
-
-1196705 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1196705
- libguestfs requires selinux-policy, but selinux-policy should be optional
-
1201507 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1201507
fuse missing from BuildRequires
1209225 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1209225
Allow configurable location for virtio drivers
-1211321 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1211321
- kernel dependency dropped between libguestfs-1.28.1-1.18.el7 and RHEL 7.2
-
-1212002 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1212002
- yum install guestfish fails on RHEL 7.1
-
-1212677 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1212677
- guestfish fails to add a remote image with ssh protocol
-
-(26 bugs)
+(21 bugs)
--------------------------------------------------
These bugs are in the VERIFIED state.
@@ -706,6 +694,15 @@ These bugs are in the VERIFIED state.
1168751 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1168751
broken lvm-set-filter API with newer lvm2
+1175196 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1175196
+ "parse-environment" and "parse-environment-list" fail to parse "LIBGUESTFS_TRACE = 0"
+
+1175676 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1175676
+ Typo error in 'help ping-daemon'
+
+1182463 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1182463
+ "mknod-b", "mknod-c", and "mkfifo" do not strip non-permissions bits from "mode"
+
1186850 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1186850
Update RHEV APT.exe
@@ -715,9 +712,21 @@ These bugs are in the VERIFIED state.
1190669 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1190669
Support virt-v2v conversion of Windows > 7
+1196705 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1196705
+ libguestfs requires selinux-policy, but selinux-policy should be optional
+
+1211321 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1211321
+ kernel dependency dropped between libguestfs-1.28.1-1.18.el7 and RHEL 7.2
+
+1212002 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1212002
+ yum install guestfish fails on RHEL 7.1
+
+1212677 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1212677
+ guestfish fails to add a remote image with ssh protocol
+
1213324 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1213324
virt-v2v: warning: unknown guest operating system: windows windows 6.3 when converting win8,win8.1,win2012,win2012R2 to rhev
-(22 bugs)
+(29 bugs)
End of BUGS file.
diff --git a/configure.ac b/configure.ac
index 9486d5d..c67db2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
# freeform string.
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [29])
-m4_define([libguestfs_release], [39])
+m4_define([libguestfs_release], [40])
AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
AC_CONFIG_AUX_DIR([build-aux])
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index 1c4022d..718b4df 100644
--- a/po-docs/libguestfs-docs.pot
+++ b/po-docs/libguestfs-docs.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.29.39\n"
+"Project-Id-Version: libguestfs 1.29.40\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/po/de.po b/po/de.po
index 2f8d00e..cc83373 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2015-01-10 08:39-0500\n"
"Last-Translator: Mario Blättermann <mario.blaettermann at gmail.com>\n"
"Language-Team: German (http://www.transifex.com/projects/p/libguestfs/"
@@ -558,14 +558,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2239,6 +2239,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2371,7 +2388,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2424,7 +2441,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7182,89 +7199,93 @@ msgstr "Umwandlung wird ausgeführt …"
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr "Umwandlungsserver:"
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr "SSH-Port:"
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr "Benutzername:"
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr "Passwort:"
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
-msgstr "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
+msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr "Fehler: Kein Umwandlungsserver angegeben."
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr "Name:"
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr "Speicher (MB):"
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7273,78 +7294,78 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr "Ausgabeformat (-of):"
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr "Information"
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr "Wechseldatenträger"
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr "Netzwerkschnittstellen"
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr "Umwandlung starten"
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr "virt-p2v (Client) %s"
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
@@ -7353,35 +7374,52 @@ msgstr ""
"virt-p2v (Client) %s\n"
"virt-v2v (Umwandlungsserver) %d.%d.%d"
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr "Gerät"
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr " Größe (GB)"
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr "Modell"
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7389,34 +7427,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr "Fehler"
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr "Umwandlung fehlgeschlagen: %s"
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr "Umwandlung fehlgeschlagen"
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr "Die Umwandlung war erfolgreich."
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr "Die Umwandlung war erfolgreich"
@@ -8763,27 +8801,29 @@ msgstr "Das Binary »%s« existiert nicht oder ist nicht ausführbar\n"
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: scheint kein qemu-Quellverzeichnis zu sein\n"
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr "libvirt-Verbindung »%s« konnte nicht geöffnet werden"
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr "libvirt-Verbindung konnte nicht geöffnet werden"
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr "libvirt-Pool »%s« konnte nicht gefunden werden: %s"
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr "libvirt-Domain »%s« konnte nicht gefunden werden: %s"
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
@@ -8792,26 +8832,31 @@ msgstr ""
"Die libvirt-Domain »%s« läuft entweder oder pausiert. Sie muss "
"heruntergefahren werden, um die Umwandlung mit virt-v2v ausführen zu können."
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr "XML-Beschreibung des Gasts »%s« konnte nicht geholt werden: %s"
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr "XML-Beschreibung des Pools »%s« konnte nicht geholt werden: %s"
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr "virt-list-filesystems: kein Image oder VM-Name angegeben"
@@ -8893,3 +8938,6 @@ msgstr ""
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr ""
"virt-win-reg: {p}: Registry-Datei konnte nicht hochgeladen werden: {err}\n"
+
+#~ msgid "virt-p2v "
+#~ msgstr "virt-p2v "
diff --git a/po/en_GB.po b/po/en_GB.po
index af18631..20127b5 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -551,14 +551,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2229,6 +2229,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2361,7 +2378,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2414,7 +2431,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7197,89 +7214,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7288,113 +7309,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7402,34 +7440,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8769,53 +8807,60 @@ msgstr ""
msgid "%s: does not look like a qemu source directory\n"
msgstr ""
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 19690aa..a835dc0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -553,14 +553,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2231,6 +2231,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2363,7 +2380,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2416,7 +2433,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7316,89 +7333,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7407,113 +7428,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7521,34 +7559,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8913,53 +8951,60 @@ msgstr "El binario '%s' no existe o no es un ejecutable\n"
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: no parece un directorio fuente de qemu\n"
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr "virt-list-filesystems: no se han ofrecido imágenes o nombres MV"
diff --git a/po/eu.po b/po/eu.po
index 91547bd..89ac31b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/libguestfs/"
@@ -551,14 +551,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2229,6 +2229,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2361,7 +2378,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2414,7 +2431,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7163,89 +7180,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7254,113 +7275,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7368,34 +7406,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8735,53 +8773,60 @@ msgstr ""
msgid "%s: does not look like a qemu source directory\n"
msgstr ""
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 2a90e9b..d920a51 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/libguestfs/"
@@ -554,14 +554,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2232,6 +2232,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2364,7 +2381,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2417,7 +2434,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7466,89 +7483,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7557,113 +7578,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7671,34 +7709,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -9131,53 +9169,60 @@ msgstr "Le binaire « %s » n'existe pas ou n'est pas exécutable\n"
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s : ne ressemble pas à un répertoire source qemu\n"
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr ""
diff --git a/po/gu.po b/po/gu.po
index 09c8fed..a6437bb 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Gujarati (http://www.transifex.com/projects/p/libguestfs/"
@@ -552,14 +552,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2230,6 +2230,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2362,7 +2379,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2415,7 +2432,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7174,89 +7191,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7265,113 +7286,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7379,34 +7417,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8746,53 +8784,60 @@ msgstr "બાઇનરી '%s' એ અસ્તિત્વ ધરાવતુ
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: qemu સ્ત્રોત ડિરેક્ટરીનાં જેવુ લાગતુ નથી\n"
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 805d631..c34e2c7 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/libguestfs/"
@@ -552,14 +552,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2230,6 +2230,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2362,7 +2379,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2415,7 +2432,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7172,89 +7189,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7263,113 +7284,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7377,34 +7415,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8744,53 +8782,60 @@ msgstr "द्विपदीय '%s' मौजूद नहीं है या
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: qemu स्रोत निर्देशिका की तरह नहीं दिखता है\n"
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index ee1e75b..763c90b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -552,14 +552,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2230,6 +2230,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2362,7 +2379,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2415,7 +2432,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7443,89 +7460,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7534,113 +7555,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7648,34 +7686,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -9113,53 +9151,60 @@ msgstr "バイナリ '%s' が存在しないか、実行可能ではありませ
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: QEMU ソースディレクトリとは違うようです\n"
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr "virt-list-filesystems: イメージまたは仮想マシン名が与えられていません"
diff --git a/po/kn.po b/po/kn.po
index 0e17f95..35a5f76 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/libguestfs/"
@@ -551,14 +551,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2229,6 +2229,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2361,7 +2378,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2414,7 +2431,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7178,89 +7195,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7269,113 +7290,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7383,34 +7421,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8750,53 +8788,60 @@ msgstr "ಬೈನರಿ '%s' ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: ಇದು ಒಂದು qemu ಆಕರ ಕೋಶದ ರೀತಿ ಕಾಣಿಸುತ್ತಿಲ್ಲ\n"
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr ""
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 2d609a1..cac191d 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.29.39\n"
+"Project-Id-Version: libguestfs 1.29.40\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -548,14 +548,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2226,6 +2226,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2358,7 +2375,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2411,7 +2428,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7160,89 +7177,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7251,113 +7272,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7365,34 +7403,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8732,53 +8770,60 @@ msgstr ""
msgid "%s: does not look like a qemu source directory\n"
msgstr ""
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 4f14c04..201d973 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/libguestfs/"
@@ -551,14 +551,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2229,6 +2229,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2361,7 +2378,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2414,7 +2431,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7174,89 +7191,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7265,113 +7286,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7379,34 +7417,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8746,53 +8784,60 @@ msgstr "ബൈനറി '%s' നിലവിലില്ല അല്ലെങ
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: qemu ഉറവിട ഡയറക്ടറിയില് നിന്നും വ്യത്യസ്ഥമാണു്\n"
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 1ef5aeb..eeaa150 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Marathi (http://www.transifex.com/projects/p/libguestfs/"
@@ -552,14 +552,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2230,6 +2230,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2362,7 +2379,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2415,7 +2432,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7241,89 +7258,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7332,113 +7353,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7446,34 +7484,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8822,53 +8860,60 @@ msgstr "बाइनरी '%s' अस्तित्वात नाही क
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: qemu स्रोत डिरेक्ट्री प्रमाणे आढळले नाही\n"
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr "virt-list-filesystems: प्रतिमा किंवा VM नाव दिले नाही"
diff --git a/po/nl.po b/po/nl.po
index a9c50d6..07667be 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -553,14 +553,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2231,6 +2231,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2363,7 +2380,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2416,7 +2433,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7351,89 +7368,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7442,113 +7463,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7556,34 +7594,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8965,53 +9003,60 @@ msgstr "Binair programma '%s' bestaat niet of is niet uitvoerbaar\n"
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: ziet er niet uit als een qemu bron map\n"
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr "virt-list-filesystems: geen image of VM naam opgegeven"
diff --git a/po/or.po b/po/or.po
index bd69e03..a8b362e 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Oriya (http://www.transifex.com/projects/p/libguestfs/"
@@ -551,14 +551,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2229,6 +2229,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2361,7 +2378,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2414,7 +2431,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7172,89 +7189,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7263,113 +7284,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7377,34 +7415,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8744,53 +8782,60 @@ msgstr "ଦ୍ୱୀମିକ '%s' ଅବସ୍ଥିତ ନାହିଁ ଅଥ
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: ଗୋଟିଏ qemu ଉତ୍ସ ଡିରେକ୍ଟୋରୀ ପରି ଲାଗୁନାହିଁ\n"
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 746d722..b6d5bc7 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/"
@@ -552,14 +552,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2230,6 +2230,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2362,7 +2379,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2415,7 +2432,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7238,89 +7255,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7329,113 +7350,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7443,34 +7481,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8820,53 +8858,60 @@ msgstr "ਬਾਇਨਰੀ '%s' ਬੰਦ ਨਹੀਂ ਹੋਇਆ ਜਾਂ
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: ਇੱਕ qemu ਸਰੋਤ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਲੱਗਦੀ\n"
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr "virt-list-filesystems: VM ਨਾਂ ਦਿੱਤਾ ਗਿਆ ਹੈ"
diff --git a/po/pl.po b/po/pl.po
index 9450ef1..4782822 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/libguestfs/"
@@ -555,14 +555,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2233,6 +2233,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2365,7 +2382,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2418,7 +2435,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7366,89 +7383,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7457,113 +7478,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7571,34 +7609,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8990,53 +9028,60 @@ msgstr "Plik binarny \"%s\" nie istnieje lub nie jest wykonywalny\n"
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: nie wygląda na katalog źródłowy QEMU\n"
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr "virt-list-filesystems: nie podano obrazu lub nazwy maszyny wirtualnej"
diff --git a/po/ru.po b/po/ru.po
index 6f0f781..6dbf490 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/libguestfs/"
@@ -552,14 +552,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2230,6 +2230,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2362,7 +2379,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2415,7 +2432,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7164,89 +7181,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7255,113 +7276,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7369,34 +7407,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8736,53 +8774,60 @@ msgstr ""
msgid "%s: does not look like a qemu source directory\n"
msgstr ""
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr ""
diff --git a/po/ta.po b/po/ta.po
index b28d415..76fa256 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Tamil (http://www.transifex.com/projects/p/libguestfs/"
@@ -551,14 +551,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2229,6 +2229,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2361,7 +2378,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2414,7 +2431,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7173,89 +7190,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7264,113 +7285,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7378,34 +7416,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8745,53 +8783,60 @@ msgstr "Binary '%s' does not exist or is not executable\n"
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: ஒரு qemu மூல அடைவு போல் இல்லை\n"
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr ""
diff --git a/po/te.po b/po/te.po
index 241a153..7554a56 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/libguestfs/"
@@ -551,14 +551,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2229,6 +2229,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2361,7 +2378,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2414,7 +2431,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7170,89 +7187,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7261,113 +7282,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7375,34 +7413,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8742,53 +8780,60 @@ msgstr "బెనరీ '%s' లేదు లేదా అది నిర్వ
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: అనునది qemu మూలపు డైరెక్టరీవలె కనిపించుటలేదు\n"
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr ""
diff --git a/po/tg.po b/po/tg.po
index 1788970..00c81a1 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Tajik (http://www.transifex.com/projects/p/libguestfs/"
@@ -550,14 +550,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2228,6 +2228,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2360,7 +2377,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2413,7 +2430,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7162,89 +7179,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7253,113 +7274,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7367,34 +7405,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8734,53 +8772,60 @@ msgstr ""
msgid "%s: does not look like a qemu source directory\n"
msgstr ""
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 908f2a1..fab3991 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -666,7 +666,7 @@ msgstr ""
"-o libvirt: параметр --qemu-boot не можна використовувати у цьому режимі "
"виведення даних"
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
@@ -676,7 +676,7 @@ msgstr ""
"target/path або не існує або цей елемент не є локальним каталогом. Див. "
"розділ «ВИВЕДЕННЯ ДО LIBVIRT» у підручнику virt-v2v(1)."
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2567,6 +2567,23 @@ msgstr ""
"Занулюємо %s…\n"
"%!"
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr "значення вирівнювання не може бути меншим за 1"
@@ -2720,7 +2737,7 @@ msgstr "з'єднання закрито"
msgid "could not add grub2 serial console (ignored)"
msgstr "не вдалося додати послідовну консоль grub2 (проігноровано)"
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2785,7 +2802,7 @@ msgstr ""
"виведені grub дані не буде надіслано до послідовного порту, але, окрім "
"цього, не зашкодить. Початкове повідомлення щодо помилки: %s"
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr "не вдалося оновити буфер libvirt %s"
@@ -8096,63 +8113,67 @@ msgstr "Виконуємо перетворення…"
msgid "Control connection closed by remote."
msgstr "З’єднання керування розірвано на віддаленому боці."
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
"Встановити з’єднання із сервером перетворення virt-v2v за допомогою SSH:"
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr "Сервер перетворення:"
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr "Порт SSH:"
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr "Користувач:"
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr "Пароль:"
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr "Використовувати sudo для запуску virt-v2v"
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr "Перевірка з'єднання"
-#: p2v/gui.c:200
-msgid "virt-p2v "
-msgstr "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
+msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr "Далі"
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr "помилка: не вказано сервер перетворення."
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
"помилка: некоректний номер порту. Якщо не знаєте, що вибрати, вкажіть «22»."
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
"помилка: не вказано імені користувача. Якщо не знаєте, що вказати, вкажіть "
"«root»."
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr "Перевіряємо з’єднання із сервером перетворення…"
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
@@ -8160,31 +8181,31 @@ msgstr ""
"Встановлено з’єднання із сервером перетворення.\n"
"Натисніть кнопку «Далі», щоб налаштувати процедуру перетворення."
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr "Властивості цілі"
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr "Назва:"
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr "К-ть вірт. проц.:"
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr "Пам’ять (МБ):"
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr "Параметри виведення virt-v2v"
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr "Виводити до (-o):"
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -8199,11 +8220,11 @@ msgstr ""
"запису системи до OpenStack Glance. Див. сторінку підручника (man) virt-"
"v2v(1), щоб дізнатися більше про параметри виведення даних."
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr "З’єднання виведення (-oc):"
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
@@ -8213,11 +8234,11 @@ msgstr ""
"слід додати гостьову систему до типового екземпляра libvirt на сервері "
"перетворення. Для інших варіантів це поле слід залишити порожнім."
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr "Сховище виведення (-os):"
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
@@ -8227,11 +8248,11 @@ msgstr ""
"<b>rhev</b>, вказати домен сховища для експортування (сервер:/точка "
"монтування). Для інших варіантів, не заповнюйте це поле."
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr "Формат виведення (-of):"
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
@@ -8239,11 +8260,11 @@ msgstr ""
"Формат диска виведення даних, типово <b>raw</b> або <b>qcow2</b>. Якщо "
"порожнє, типовим значенням вважається <b>raw</b>."
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr "Розташовування виведення (-oa):"
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
@@ -8251,36 +8272,36 @@ msgstr ""
"Увімкнути діагностику на боці сервера\n"
"(Дані зберігаються у каталозі /tmp сервера перетворення)"
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr "Інформація"
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr "Стаціонарні жорсткі диски"
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr "Портативний носій"
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr "Мережеві інтерфейси"
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr "Назад"
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr "Розпочати перетворення"
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr "virt-p2v (клієнт) %s"
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
@@ -8289,35 +8310,52 @@ msgstr ""
"virt-p2v (клієнт) %s\n"
"virt-v2v (сервер перетворення) %d.%d.%d"
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr "Перетворити"
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr "Пристрій"
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr "Розмір (ГБ)"
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr "Модель"
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr "Встановити з’єднання із віртуальною мережею"
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr "Скасувати перетворення"
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -8328,15 +8366,15 @@ msgstr ""
"цього каталогу:\n"
"%s"
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr "Порожнє поле «Назва» гостьової системи."
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr "Помилка"
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
@@ -8344,20 +8382,20 @@ msgstr ""
"Не вказано дисків для перетворення.\n"
"Слід вказати принаймні один стаціонарний жорсткий диск.\n"
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr "Помилка під час перетворення: %s"
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr "Перетворення не вдалося"
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr "Перетворення виконано успішно."
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr "Успішне перетворення"
@@ -9872,27 +9910,29 @@ msgstr "Виконуваного файла «%s» не існує або вка
msgid "%s: does not look like a qemu source directory\n"
msgstr "%s: не є каталогом початкових кодів qemu\n"
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr "не вдалося відкрити з’єднання libvirt «%s»"
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr "не вдалося відкрити з’єднання libvirt"
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr "не вдалося знайти буфер libvirt «%s»: %s"
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr "не вдалося знайти домен libvirt «%s»: %s"
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
@@ -9901,26 +9941,31 @@ msgstr ""
"Домен libvirt «%s» працює або його призупинено. Роботу домену слід завершити "
"для виконання перетворення virt-v2v"
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr "не вдалося отримати опис XML гостьової системи «%s»: %s"
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr "не вдалося отримати опис XML буфера «%s»: %s"
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr "virt-list-filesystems: не вказано образу або назви віртуальної машини"
@@ -10015,6 +10060,9 @@ msgstr "virt-win-reg: {p}: не вдалося отримати файл рег
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr "virt-win-reg: {p}: не вдалося вивантажити файл регістра: {err}\n"
+#~ msgid "virt-p2v "
+#~ msgstr "virt-p2v "
+
#~ msgid "Installing firstboot command: [%d] %s"
#~ msgstr "Встановлюємо програму firstboot: [%d] %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a119fa5..fe69449 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
@@ -551,14 +551,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2229,6 +2229,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2361,7 +2378,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2414,7 +2431,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7163,89 +7180,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7254,113 +7275,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7368,34 +7406,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8735,53 +8773,60 @@ msgstr ""
msgid "%s: does not look like a qemu source directory\n"
msgstr ""
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a70febf..9516093 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs 1.29.26\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-02 09:19+0100\n"
+"POT-Creation-Date: 2015-05-06 17:08+0100\n"
"PO-Revision-Date: 2014-10-18 04:00-0400\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
@@ -551,14 +551,14 @@ msgstr ""
msgid "-o libvirt: --qemu-boot option cannot be used in this output mode"
msgstr ""
-#: ../v2v/output_libvirt.ml:365
+#: ../v2v/output_libvirt.ml:368
msgid ""
"-o libvirt: output pool '%s' has type='dir' but the /pool/target/path "
"element either does not exist or is not a local directory. See virt-v2v(1) "
"section \"OUTPUT TO LIBVIRT\""
msgstr ""
-#: ../v2v/output_libvirt.ml:362
+#: ../v2v/output_libvirt.ml:365
msgid ""
"-o libvirt: output pool '%s' is not a directory (type='dir'). See virt-"
"v2v(1) section \"OUTPUT TO LIBVIRT\""
@@ -2229,6 +2229,23 @@ msgid ""
"%!"
msgstr ""
+#: ../v2v/output_libvirt.ml:339
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-p2v, select a different 'Name' in the 'Target properties'. Or "
+"delete the existing domain on the target using the 'virsh undefine' command."
+msgstr ""
+
+#: ../v2v/output_libvirt.ml:342
+msgid ""
+"a libvirt domain called '%s' already exists on the target.\n"
+"\n"
+"If using virt-v2v directly, use the '-on' option to select a different name. "
+"Or delete the existing domain on the target using the 'virsh undefine' "
+"command."
+msgstr ""
+
#: ../resize/resize.ml:276
msgid "alignment cannot be < 1"
msgstr ""
@@ -2361,7 +2378,7 @@ msgstr ""
msgid "could not add grub2 serial console (ignored)"
msgstr ""
-#: ../v2v/output_libvirt.ml:415
+#: ../v2v/output_libvirt.ml:418
msgid ""
"could not define libvirt domain. The libvirt XML is still available in "
"'%s'. Try running 'virsh define %s' yourself instead."
@@ -2414,7 +2431,7 @@ msgid ""
"harmless. Original error message: %s"
msgstr ""
-#: ../v2v/output_libvirt.ml:387
+#: ../v2v/output_libvirt.ml:390
msgid "could not refresh libvirt pool %s"
msgstr ""
@@ -7163,89 +7180,93 @@ msgstr ""
msgid "Control connection closed by remote."
msgstr ""
-#: p2v/gui.c:116
+#: p2v/gui.c:120
msgid "Connect to a virt-v2v conversion server over SSH:"
msgstr ""
-#: p2v/gui.c:121
+#: p2v/gui.c:125
msgid "Conversion server:"
msgstr ""
-#: p2v/gui.c:131
+#: p2v/gui.c:135
msgid "SSH port:"
msgstr ""
-#: p2v/gui.c:142
+#: p2v/gui.c:146
msgid "User name:"
msgstr ""
-#: p2v/gui.c:154
+#: p2v/gui.c:158
msgid "Password:"
msgstr ""
-#: p2v/gui.c:170
+#: p2v/gui.c:174
msgid "Use sudo when running virt-v2v"
msgstr ""
-#: p2v/gui.c:177
+#: p2v/gui.c:181
msgid "Test connection"
msgstr ""
-#: p2v/gui.c:200
-msgid "virt-p2v "
+#: p2v/gui.c:203
+msgid "Configure network ..."
+msgstr ""
+
+#: p2v/gui.c:204
+msgid "About virt-p2v "
msgstr ""
-#: p2v/gui.c:201
+#: p2v/gui.c:205
msgid "Next"
msgstr ""
-#: p2v/gui.c:251
+#: p2v/gui.c:259
msgid "error: No conversion server given."
msgstr ""
-#: p2v/gui.c:259
+#: p2v/gui.c:267
msgid "error: Invalid port number. If in doubt, use \"22\"."
msgstr ""
-#: p2v/gui.c:267
+#: p2v/gui.c:275
msgid "error: No user name. If in doubt, use \"root\"."
msgstr ""
-#: p2v/gui.c:308
+#: p2v/gui.c:316
msgid "Testing the connection to the conversion server ..."
msgstr ""
-#: p2v/gui.c:327
+#: p2v/gui.c:335
msgid ""
"Connected to the conversion server.\n"
"Press the \"Next\" button to configure the conversion process."
msgstr ""
-#: p2v/gui.c:430
+#: p2v/gui.c:447
msgid "Target properties"
msgstr ""
-#: p2v/gui.c:436
+#: p2v/gui.c:453
msgid "Name:"
msgstr ""
-#: p2v/gui.c:446
+#: p2v/gui.c:463
msgid "# vCPUs:"
msgstr ""
-#: p2v/gui.c:456
+#: p2v/gui.c:477
msgid "Memory (MB):"
msgstr ""
-#: p2v/gui.c:470
+#: p2v/gui.c:503
msgid "Virt-v2v output options"
msgstr ""
-#: p2v/gui.c:476
+#: p2v/gui.c:509
msgid "Output to (-o):"
msgstr ""
-#: p2v/gui.c:481
+#: p2v/gui.c:514
msgid ""
"<b>libvirt</b> means send the converted guest to libvirt-managed KVM on the "
"conversion server. <b>local</b> means put it in a directory on the "
@@ -7254,113 +7275,130 @@ msgid ""
"more information about output options."
msgstr ""
-#: p2v/gui.c:486
+#: p2v/gui.c:519
msgid "Output conn. (-oc):"
msgstr ""
-#: p2v/gui.c:491
+#: p2v/gui.c:524
msgid ""
"For <b>libvirt</b> only, the libvirt connection URI, or leave blank to add "
"the guest to the default libvirt instance on the conversion server. For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:497
+#: p2v/gui.c:530
msgid "Output storage (-os):"
msgstr ""
-#: p2v/gui.c:502
+#: p2v/gui.c:535
msgid ""
"For <b>local</b>, put the directory name on the conversion server. For "
"<b>rhev</b>, put the Export Storage Domain (server:/mountpoint). For "
"others, leave this field blank."
msgstr ""
-#: p2v/gui.c:508
+#: p2v/gui.c:541
msgid "Output format (-of):"
msgstr ""
-#: p2v/gui.c:513
+#: p2v/gui.c:546
msgid ""
"The output disk format, typically <b>raw</b> or <b>qcow2</b>. If blank, "
"defaults to <b>raw</b>."
msgstr ""
-#: p2v/gui.c:519
+#: p2v/gui.c:552
msgid "Output allocation (-oa):"
msgstr ""
-#: p2v/gui.c:538
+#: p2v/gui.c:571
msgid ""
"Enable server-side debugging\n"
"(This is saved in /tmp on the conversion server)"
msgstr ""
-#: p2v/gui.c:547
+#: p2v/gui.c:580
msgid "Information"
msgstr ""
-#: p2v/gui.c:555
+#: p2v/gui.c:588
msgid "Fixed hard disks"
msgstr ""
-#: p2v/gui.c:567
+#: p2v/gui.c:600
msgid "Removable media"
msgstr ""
-#: p2v/gui.c:579
+#: p2v/gui.c:612
msgid "Network interfaces"
msgstr ""
-#: p2v/gui.c:607
+#: p2v/gui.c:640
msgid "Back"
msgstr ""
-#: p2v/gui.c:608
+#: p2v/gui.c:641
msgid "Start conversion"
msgstr ""
-#: p2v/gui.c:644
+#: p2v/gui.c:683
#, c-format
msgid "virt-p2v (client) %s"
msgstr ""
-#: p2v/gui.c:647
+#: p2v/gui.c:686
#, c-format
msgid ""
"virt-p2v (client) %s\n"
"virt-v2v (conversion server) %d.%d.%d"
msgstr ""
-#: p2v/gui.c:770 p2v/gui.c:825 p2v/gui.c:873
+#: p2v/gui.c:809 p2v/gui.c:864 p2v/gui.c:912
msgid "Convert"
msgstr ""
-#: p2v/gui.c:777 p2v/gui.c:832 p2v/gui.c:880
+#: p2v/gui.c:816 p2v/gui.c:871 p2v/gui.c:919
msgid "Device"
msgstr ""
-#: p2v/gui.c:784
+#: p2v/gui.c:823
msgid "Size (GB)"
msgstr ""
-#: p2v/gui.c:791
+#: p2v/gui.c:830
msgid "Model"
msgstr ""
-#: p2v/gui.c:887
+#: p2v/gui.c:926
msgid "Connect to virtual network"
msgstr ""
-#: p2v/gui.c:1098
+#: p2v/gui.c:1154
+#, c-format
+msgid ""
+"Number of virtual CPUs is larger than what is supported for KVM (max: %d)."
+msgstr ""
+
+#: p2v/gui.c:1164
+#, c-format
+msgid "Memory size is larger than what is supported for KVM (max: %<PRIu64>)."
+msgstr ""
+
+#: p2v/gui.c:1172
+msgid ""
+"If you ignore this warning, conversion can still succeed, but the guest may "
+"not work or may not be supported on the target."
+msgstr ""
+
+#: p2v/gui.c:1249
msgid "Cancel conversion"
msgstr ""
-#: p2v/gui.c:1099
+#: p2v/gui.c:1250
msgid "Reboot"
msgstr ""
-#: p2v/gui.c:1134
+#: p2v/gui.c:1285
#, c-format
msgid ""
"Log files and debug information is saved to this directory on the conversion "
@@ -7368,34 +7406,34 @@ msgid ""
"%s"
msgstr ""
-#: p2v/gui.c:1195
+#: p2v/gui.c:1345
msgid "The guest \"Name\" field is empty."
msgstr ""
-#: p2v/gui.c:1196 p2v/gui.c:1229
+#: p2v/gui.c:1346 p2v/gui.c:1370
msgid "Error"
msgstr ""
-#: p2v/gui.c:1227
+#: p2v/gui.c:1368
msgid ""
"No disks were selected for conversion.\n"
"At least one fixed hard disk must be selected.\n"
msgstr ""
-#: p2v/gui.c:1314
+#: p2v/gui.c:1455
#, c-format
msgid "Conversion failed: %s"
msgstr ""
-#: p2v/gui.c:1315
+#: p2v/gui.c:1456
msgid "Conversion failed"
msgstr ""
-#: p2v/gui.c:1324
+#: p2v/gui.c:1465
msgid "The conversion was successful."
msgstr ""
-#: p2v/gui.c:1325
+#: p2v/gui.c:1466
msgid "Conversion was successful"
msgstr ""
@@ -8735,53 +8773,60 @@ msgstr ""
msgid "%s: does not look like a qemu source directory\n"
msgstr ""
-#: v2v/domainxml-c.c:135 v2v/domainxml-c.c:205
+#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207 v2v/domainxml-c.c:391
+#: v2v/domainxml-c.c:446
#, c-format
msgid "cannot open libvirt connection '%s'"
msgstr ""
-#: v2v/domainxml-c.c:137 v2v/domainxml-c.c:207
+#: v2v/domainxml-c.c:139 v2v/domainxml-c.c:209 v2v/domainxml-c.c:393
+#: v2v/domainxml-c.c:448
#, c-format
msgid "cannot open libvirt connection"
msgstr ""
-#: v2v/domainxml-c.c:158
+#: v2v/domainxml-c.c:160
#, c-format
msgid "cannot find libvirt pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:228
+#: v2v/domainxml-c.c:230 v2v/domainxml-c.c:472
#, c-format
msgid "cannot find libvirt domain '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:243
+#: v2v/domainxml-c.c:245
#, c-format
msgid ""
"libvirt domain '%s' is running or paused. It must be shut down in order to "
"perform virt-v2v conversion"
msgstr ""
-#: v2v/domainxml-c.c:256
+#: v2v/domainxml-c.c:258
#, c-format
msgid "cannot fetch XML description of guest '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:293
+#: v2v/domainxml-c.c:295
#, c-format
msgid "cannot fetch XML description of pool '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:336
+#: v2v/domainxml-c.c:338
#, c-format
msgid "cannot find libvirt volume '%s': %s"
msgstr ""
-#: v2v/domainxml-c.c:346
+#: v2v/domainxml-c.c:348
#, c-format
msgid "cannot fetch XML description of volume '%s': %s"
msgstr ""
+#: v2v/domainxml-c.c:407
+#, c-format
+msgid "cannot get libvirt hypervisor capabilities: %s"
+msgstr ""
+
#: tools/virt-list-filesystems:147
msgid "virt-list-filesystems: no image or VM name given"
msgstr ""
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list