[Pkg-libvirt-commits] [libguestfs] 23/26: Version 1.28.11.
Hilko Bengen
bengen at moszumanska.debian.org
Sun Nov 1 17:11:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag upstream/1.28.12
in repository libguestfs.
commit 7d8a8b9d1ddfeb87f2aa4515cdabacaebda9e3b8
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Thu Jul 16 15:09:50 2015 +0100
Version 1.28.11.
---
BUGS | 281 +++++++++++++++++++++++++++++---------------
configure.ac | 2 +-
po-docs/ja.po | 185 +++++++++++++++--------------
po-docs/libguestfs-docs.pot | 186 +++++++++++++++--------------
po-docs/uk.po | 211 ++++++++++++++++++---------------
po/en_GB.po | 113 +++++++++---------
po/es.po | 128 +++++++++++---------
po/gu.po | 118 ++++++++++---------
po/hi.po | 118 ++++++++++---------
po/kn.po | 118 ++++++++++---------
po/libguestfs.pot | 110 ++++++++---------
po/ml.po | 118 ++++++++++---------
po/mr.po | 128 +++++++++++---------
po/nl.po | 128 +++++++++++---------
po/or.po | 118 ++++++++++---------
po/pa.po | 128 +++++++++++---------
po/pl.po | 129 +++++++++++---------
po/ta.po | 113 +++++++++---------
po/te.po | 113 +++++++++---------
po/uk.po | 136 +++++++++++----------
20 files changed, 1455 insertions(+), 1226 deletions(-)
diff --git a/BUGS b/BUGS
index 1eee249..3b972b0 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2015-05-06
+Last updated: 2015-07-16
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
@@ -77,9 +77,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
855058 NEW https://bugzilla.redhat.com/show_bug.cgi?id=855058
RFE: virt-p2v: display more information about storage devices
-855059 NEW https://bugzilla.redhat.com/show_bug.cgi?id=855059
- RFE: virt-p2v: display more information about network devices such as topology, bonding, etc.
-
857763 NEW https://bugzilla.redhat.com/show_bug.cgi?id=857763
libguestfs 'file-architecture' returns 'ARM' for arm binaries
@@ -188,9 +185,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1057873 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1057873
libguestfs df/ subdirectory tests fail occasionally
-1059428 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1059428
- Failed dependencies installing libguestfs with glibc ppc64p7
-
1060423 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1060423
Support setting xattrs via FUSE
@@ -248,9 +242,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1108171 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1108171
RFE: virt-builder should be able to build PXE images for baremetal installation
-1111794 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1111794
- virt-sparsify leaves lots of data in TMPDIR
-
1114012 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1114012
"yum install guestfish" on fresh Fedora 20 results in broken libguestfs
@@ -278,21 +269,12 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1144137 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1144137
virt-inspector fails on Minix 3 guest
-1146007 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1146007
- Input/output error during conversion of esx guest.
-
1146477 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1146477
virt-v2v sometimes hangs with printing: Add. Sense: No additional sense information
1150298 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1150298
ARM 32 bit on Ubuntu: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
-1150816 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1150816
- Can not find "RECURSIVE LONG LISTING" in 'man virt-diff'
-
-1150858 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1150858
- virt-sparsify: unknown option `--check-tmpdir=ignore'
-
1151902 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1151902
virt-v2v:Network interface disappear after conversion of guest with interface type direct
@@ -347,17 +329,11 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1166057 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1166057
btrfs filesystem will not work well if you create the filesystem with multiple disks at the same time, such as: mkfs-btrfs "/dev/sda1 /dev/sdb1"
-1167623 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1167623
- Remove "If reporting bugs, run virt-v2v with debugging enabled .." message when running virt-p2v
-
1167916 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1167916
P2V error:unexpected end of file waiting for password prompt.
-1167922 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1167922
- p2v: No virtual console
-
1168626 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1168626
- Tracker: Build RHEL 7.1 - based virt-p2v ISO
+ Tracker: Build RHEL 7.2 - based virt-p2v ISO
1168865 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1168865
warning: /files/boot/grub/device.map/hd0 references unknown device "vda" when convert a local guest with virtio disk to openstack server (-i disk))
@@ -378,7 +354,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
virt-resize on RHEL 5.7 fails to resize the raw format disk image
1173695 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1173695
- Error occurred when install a rhel guest with disk pool
+ RFE: allow passing in a pre-opened libvirt connection from python
1174551 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1174551
"lstatnslist" and "lstatlist" don't give an error if the API is used wrongly
@@ -404,15 +380,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1183493 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1183493
RFE: virt-rescue: add a flag to autorun the suggested mount commands and chroot, suggested with --suggest
-1183780 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1183780
- guestfs needs README.fixed to actually work
-
-1184762 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1184762
- fuse test deadlocks on Rawhide
-
-1186800 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1186800
- virt-v2v should support gzip format ova as input
-
1186935 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1186935
libguestfs cannot inspect recent Fedora / RHEL >= 7 when /usr is a separate partition
@@ -431,9 +398,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1197786 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1197786
virt-builder fails --get-kernel on F21 PPC64 iso
-1199605 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1199605
- FTBFS: requires file >= 5.11-22 but file = 5.11-21 is in release
-
1203595 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1203595
No error messages output if append '--format qcow2' after '-a guest.img', guest.img is a raw format image file
@@ -461,18 +425,12 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1212679 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1212679
Failed to create a augeas handle with flag=8 because of custom lens (guestfs_lvm_conf.aug)
-1212807 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1212807
- virt-builder --selinux-relabel flag fails on cross-architecture builds
-
1213274 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1213274
Improve the misunderstanding error messages of virt-tar-in/virt-tar-out/virt-copy-in/virt-copy-out
1213319 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1213319
[RFE]virt-v2v support convert guest with all interface types to others
-1213691 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1213691
- Win2012R2 guest fails to boot on iscsi data domain after conversion by virt-v2v
-
1213701 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1213701
Fail to import win8/win2012 to rhev with error "selected display type is not supported"
@@ -500,6 +458,69 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
1218934 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1218934
virt-sparsify: read all the output from 'qemu-img --help'
+1220751 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1220751
+ fusermount returns EBUSY, but unmounts the disk anyway, confusing guestunmount
+
+1221569 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1221569
+ aarch64: add-drive-opts fails to hot plug a disk
+
+1221571 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1221571
+ aarch64: md-create fails to create Linux md (RAID) device
+
+1222231 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1222231
+ virt-builder --size fails on debian-7/8 because of updated sfdisk in util-linux 2.62.2
+
+1224795 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1224795
+ On Ubuntu, virt-builder --install and --update cannot use the network
+
+1224903 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1224903
+ 'guestmount: no operating system was found on this disk' for rhel7 be guest on ppc64le host
+
+1225789 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1225789
+ Wrong video driver is installed for rhel5.11 guest after conversion to libvirt
+
+1227599 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1227599
+ P2V error:unexpected end of file waiting for command prompt.
+
+1227609 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1227609
+ Output method shows three times in virt-p2v client.
+
+1227621 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1227621
+ Log file saved on conversion server even "Enable server-side debugging" is not ticked
+
+1229119 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1229119
+ Unrelated info in fstab makes virt-v2v fail with unclear error info
+
+1229262 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1229262
+ virt-p2v doesn't work under no GUI mode
+
+1229386 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1229386
+ virt-p2v in non-GUI mode doesn't show any conversion progress or status
+
+1230412 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1230412
+ virt-v2v should ignore bogus kernel entries in grub config
+
+1230414 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1230414
+ Windows inspection fails with hivex_close: do_hivex_close: you must call 'hivex-open' first to initialize the hivex handle
+
+1232477 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1232477
+ guestfs_add_drive_opts incorrectly quotes query parameters
+
+1233093 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1233093
+ QXL driver is not installed for some version of windows guest after convert to RHEV
+
+1237250 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1237250
+ aarch64: libguestfs should now prefer virtio-pci
+
+1238615 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1238615
+ "Domain not found" error shows several times during virt-v2v conversion
+
+1242028 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1242028
+ virt-make-fs cannot set g+s bit on vfat
+
+1242853 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1242853
+ mount-loop failed to setup loop device: No such file or directory
+
503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
guestfish's list splitting does not recognize internal quoting
@@ -546,46 +567,46 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
[RFE] virt-v2v should support convert a guest to a dir-pool with using pool's uuid
1143887 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1143887
- Warning shows when converting guests to rhev:chown: changing ownership of ?/tmp/v2v.u48xag/*.ovf?: Invalid argument
+ virt-v2v: warning: cannot write files to the NFS server as 36:36
1144138 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1144138
virt-inspector fails on FreeBSD 9.3 guest
+1152369 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1152369
+ virt-v2v failed to convert RHEL 6.7 UEFI guest: no grub1/grub-legacy or grub2 configuration file was found
+
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.
+1190669 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1190669
+ Support virt-v2v conversion of Windows > 7
1198344 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1198344
[RFE] virt-builder should support download resume
-1211996 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1211996
- virt-inspector gives incorrect arch (ppc64) for ppc64le guest
-
-(182 bugs)
+(189 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
+1167623 POST https://bugzilla.redhat.com/show_bug.cgi?id=1167623
+ Remove "If reporting bugs, run virt-v2v with debugging enabled .." message when running virt-p2v
-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
+1194472 POST https://bugzilla.redhat.com/show_bug.cgi?id=1194472
+ Current virt-builder index breaks version < 1.26
-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)
+1229305 POST https://bugzilla.redhat.com/show_bug.cgi?id=1229305
+ virt-sysprep at cleanup deletes /var/spool/at/.SEQ which results in failing at
-1167921 POST https://bugzilla.redhat.com/show_bug.cgi?id=1167921
- p2v: No Network Connection dialog
+1238053 POST https://bugzilla.redhat.com/show_bug.cgi?id=1238053
+ v2v:Duplicate disk target set when convert guest with cdrom attached
-1194472 POST https://bugzilla.redhat.com/show_bug.cgi?id=1194472
- Current virt-builder index breaks version < 1.26
+855059 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=855059
+ RFE: virt-p2v: display more information about network devices such as topology, bonding, etc.
1053847 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1053847
Recommended default clock/timer settings
@@ -593,53 +614,59 @@ You can help by testing the fixes.
1020950 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1020950
CVE-2013-4419 libguestfs: insecure temporary directory handling for guestfish's network socket [epel-5]
-1140946 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1140946
- qemu-img shows error message for backing file twice
+1146007 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1146007
+ Input/output error during conversion of esx guest.
1159030 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1159030
libvirt backend does not set RBD password
-1165564 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1165564
- Provide Reboot/Shutdown button after virt-p2v
-
-1165569 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1165569
- Disable "cancel conversion" button after virt-p2v conversion finished
+1172660 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1172660
+ virt-resize --expand fails on ubuntu-14.04.img image
-1167601 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1167601
- "Conversion was successful" pop out even virt-p2v fails
+1177910 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1177910
+ Libguestfs fails to locate the qemu-kvm on POWER8(BE) host.
-1167774 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1167774
- virt-p2v fails with error:"nbd.c:nbd_receive_negotiate():L501: read failed"
+1199605 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1199605
+ FTBFS: requires file >= 5.11-22 but file = 5.11-21 is in release
-1172660 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1172660
- virt-resize --expand fails on ubuntu-14.04.img image
+1201507 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1201507
+ fuse missing from BuildRequires
-1174073 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1174073
- The listen address for vnc is changed after conversion by virt-v2v
+1213324 ON_QA 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
-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
+1213691 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1213691
+ Win2012R2 guest fails to boot on iscsi data domain after conversion by virt-v2v
-1176493 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1176493
- virt-v2v ignores sound device when convert xen guest to local kvm
+1224486 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1224486
+ virt-resize should preserve GPT partition UUIDs, else EFI guests become unbootable
-1176591 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1176591
- virt-v2v -o vdsm doesn't work with multiple data domains
+1224675 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1224675
+ ppc64le: virt-sparsify fails to make a disk image sparse, the output log indicates it gets the wrong parameter in the disk create step
-1176598 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1176598
- virt-v2v -o vdsm write ovf to specify domain
+1224676 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1224676
+ ppc64le: virt-resize/virt-build/virt-sysprep/virt-customize fail to execute and return the error "Segmentation fault (core dumped)"
-1201507 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1201507
- fuse missing from BuildRequires
+1225467 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1225467
+ virt-sparsify refuses to work on qcow2 files
-1209225 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1209225
- Allow configurable location for virtio drivers
+1238579 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1238579
+ virt-sysprep at cleanup deletes /var/spool/at/.SEQ which results in failing at
-(21 bugs)
+(20 bugs)
--------------------------------------------------
These bugs are in the VERIFIED state.
+823758 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=823758
+ p2v client should have largest number restrictions for CPU and Memory settings
+
+889082 VERIFIED 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
+
+1038977 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1038977
+ libguestfs does not works together with xfs + 4k sector size
+
1074005 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1074005
java bindings inspect_list_applications2 throws java.lang.ArrayIndexOutOfBoundsException:
@@ -659,7 +686,7 @@ These bugs are in the VERIFIED state.
libguests tools failing on images containing a colon in the path
1138630 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1138630
- Remove user accounts from "/etc/shadow" when exeucte virt-sysprep with '--enable user-account' option
+ Remove user accounts from "/etc/shadow" when execute virt-sysprep with '--enable user-account' option
1146832 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1146832
virt-v2v fail to convert guest with disk type volume
@@ -688,18 +715,51 @@ These bugs are in the VERIFIED state.
1164734 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1164734
The description of 'help append' is not accurately, it add the kernel options to libguestfs appliance not the guest kernel
+1165564 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1165564
+ Provide Reboot/Shutdown button after virt-p2v
+
+1165569 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1165569
+ Disable "cancel conversion" button after virt-p2v conversion finished
+
+1167601 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1167601
+ "Conversion was successful" pop out even virt-p2v fails
+
+1167774 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1167774
+ virt-p2v fails with error:"nbd.c:nbd_receive_negotiate():L501: read failed"
+
+1167921 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1167921
+ p2v: No Network Connection dialog
+
+1167922 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1167922
+ p2v: No virtual console
+
1168144 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1168144
warning: fstrim: fstrim: /sysroot/: FITRIM ioctl failed: Operation not supported (ignored) when convert win2003 guest from xen server
1168751 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1168751
broken lvm-set-filter API with newer lvm2
+1174073 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1174073
+ The listen address for vnc is changed after conversion by virt-v2v
+
+1174200 VERIFIED 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 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'
+1176493 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1176493
+ virt-v2v ignores sound device when convert xen guest to local kvm
+
+1176591 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1176591
+ virt-v2v -o vdsm doesn't work with multiple data domains
+
+1176598 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1176598
+ virt-v2v -o vdsm write ovf to specify domain
+
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"
@@ -709,12 +769,12 @@ These bugs are in the VERIFIED state.
1187231 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1187231
rhsrvany crashes when run as a service
-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
+1209225 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1209225
+ Allow configurable location for virtio drivers
+
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
@@ -724,9 +784,36 @@ These bugs are in the VERIFIED state.
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
+1222975 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1222975
+ virt-p2v network does not start
+
+1226794 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1226794
+ "Doing conversion??" still shows after cancel the conversion from virt-p2v client
+
+1229340 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1229340
+ virt-p2v no GUI mode appends n to the final command line parameter
+
+1229385 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1229385
+ virt-p2v in kernel command line mode should power off the machine after conversion
+
+1232192 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1232192
+ Virt-v2v gives an error on a blank disk: part_get_parttype: unknown signature, of the output: BYT;
+
+1234351 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1234351
+ virt-v2v Support for Fedora virtio-win drivers
+
+1237869 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1237869
+ Virtio drivers are not installed for windows 2008 guests by virt-v2v
+
+1239053 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1239053
+ virt-v2v error reporting when grub.conf cannot be parsed by Augeas
+
+1240274 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1240274
+ Remove references in error messages to libguestfs-winsupport
+
+1240276 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1240276
+ Add checks to ensure libguestfs-winsupport functionality only available to virt-v2v and virt-p2v
-(29 bugs)
+(52 bugs)
End of BUGS file.
diff --git a/configure.ac b/configure.ac
index 6d618e1..108c0fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
# freeform string.
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [28])
-m4_define([libguestfs_release], [10])
+m4_define([libguestfs_release], [11])
AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
AC_CONFIG_AUX_DIR([build-aux])
diff --git a/po-docs/ja.po b/po-docs/ja.po
index d25b61d..80a4f63 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2015-04-26 15:59+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+0100\n"
"PO-Revision-Date: 2014-10-18 08:01+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/libguestfs/"
@@ -395,7 +395,7 @@ msgstr ""
#: ../fuse/guestmount.pod:159 ../fuse/guestunmount.pod:70
#: ../inspector/virt-inspector.pod:52 ../make-fs/virt-make-fs.pod:117
#: ../p2v/virt-p2v-make-disk.pod:49 ../p2v/virt-p2v-make-kickstart.pod:135
-#: ../p2v/virt-p2v.pod:435 ../rescue/virt-rescue.pod:113
+#: ../p2v/virt-p2v.pod:438 ../rescue/virt-rescue.pod:113
#: ../resize/virt-resize.pod:266 ../sparsify/virt-sparsify.pod:114
#: ../sysprep/virt-sysprep.pod:38 ../test-tool/libguestfs-test-tool.pod:34
#: ../tools/virt-list-filesystems:52 ../tools/virt-list-partitions:53
@@ -415,7 +415,7 @@ msgstr "オプション"
#: ../fuse/guestmount.pod:240 ../fuse/guestunmount.pod:79
#: ../inspector/virt-inspector.pod:56 ../make-fs/virt-make-fs.pod:121
#: ../p2v/virt-p2v-make-disk.pod:53 ../p2v/virt-p2v-make-kickstart.pod:139
-#: ../p2v/virt-p2v.pod:439 ../rescue/virt-rescue.pod:117
+#: ../p2v/virt-p2v.pod:442 ../rescue/virt-rescue.pod:117
#: ../resize/virt-resize.pod:270 ../sparsify/virt-sparsify.pod:118
#: ../sysprep/virt-sysprep.pod:42 ../test-tool/libguestfs-test-tool.pod:38
#: ../tools/virt-list-filesystems:60 ../tools/virt-list-partitions:61
@@ -779,7 +779,7 @@ msgstr ""
#: ../df/virt-df.pod:183 ../diff/virt-diff.pod:197 ../edit/virt-edit.pod:203
#: ../fish/guestfish.pod:419 ../format/virt-format.pod:153
#: ../fuse/guestmount.pod:372 ../inspector/virt-inspector.pod:122
-#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:448
+#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:451
#: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:581
#: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:222
#: ../v2v/virt-v2v.pod:623
@@ -794,7 +794,7 @@ msgstr "B<-v>"
#: ../df/virt-df.pod:185 ../diff/virt-diff.pod:199 ../edit/virt-edit.pod:205
#: ../fish/guestfish.pod:421 ../format/virt-format.pod:155
#: ../fuse/guestmount.pod:374 ../inspector/virt-inspector.pod:124
-#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:450
+#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:453
#: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:583
#: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:224
#: ../v2v/virt-v2v.pod:625
@@ -825,7 +825,7 @@ msgstr "デバッグ用の冗長なメッセージを有効にします。"
#: ../fuse/guestmount.pod:378 ../fuse/guestunmount.pod:105
#: ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:203
#: ../p2v/virt-p2v-make-disk.pod:64 ../p2v/virt-p2v-make-kickstart.pod:154
-#: ../p2v/virt-p2v.pod:454 ../rescue/virt-rescue.pod:244
+#: ../p2v/virt-p2v.pod:457 ../rescue/virt-rescue.pod:244
#: ../resize/virt-resize.pod:587 ../sparsify/virt-sparsify.pod:298
#: ../sysprep/virt-sysprep.pod:228 ../test-tool/libguestfs-test-tool.pod:59
#: ../v2v/virt-v2v.pod:629
@@ -844,7 +844,7 @@ msgstr "B<-V>"
#: ../fuse/guestmount.pod:380 ../fuse/guestunmount.pod:107
#: ../inspector/virt-inspector.pod:130 ../make-fs/virt-make-fs.pod:205
#: ../p2v/virt-p2v-make-disk.pod:66 ../p2v/virt-p2v-make-kickstart.pod:156
-#: ../p2v/virt-p2v.pod:456 ../rescue/virt-rescue.pod:246
+#: ../p2v/virt-p2v.pod:459 ../rescue/virt-rescue.pod:246
#: ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:300
#: ../sysprep/virt-sysprep.pod:230 ../test-tool/libguestfs-test-tool.pod:61
#: ../tools/virt-list-filesystems:68 ../tools/virt-list-partitions:69
@@ -860,7 +860,7 @@ msgstr "B<--version>"
#: ../df/virt-df.pod:193 ../diff/virt-diff.pod:207 ../edit/virt-edit.pod:213
#: ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:132
#: ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v-make-disk.pod:68
-#: ../p2v/virt-p2v-make-kickstart.pod:158 ../p2v/virt-p2v.pod:458
+#: ../p2v/virt-p2v-make-kickstart.pod:158 ../p2v/virt-p2v.pod:461
#: ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:591
#: ../sparsify/virt-sparsify.pod:302 ../sysprep/virt-sysprep.pod:232
#: ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71
@@ -1485,7 +1485,7 @@ msgstr ""
#: ../inspector/virt-inspector.pod:498 ../java/examples/guestfs-java.pod:156
#: ../lua/examples/guestfs-lua.pod:136 ../make-fs/virt-make-fs.pod:215
#: ../ocaml/examples/guestfs-ocaml.pod:76 ../p2v/virt-p2v-make-disk.pod:103
-#: ../p2v/virt-p2v-make-kickstart.pod:194 ../p2v/virt-p2v.pod:584
+#: ../p2v/virt-p2v-make-kickstart.pod:194 ../p2v/virt-p2v.pod:587
#: ../perl/examples/guestfs-perl.pod:38
#: ../python/examples/guestfs-python.pod:51 ../rescue/virt-rescue.pod:412
#: ../resize/virt-resize.pod:755 ../ruby/examples/guestfs-ruby.pod:34
@@ -1528,7 +1528,7 @@ msgstr "著者"
#: ../edit/virt-edit.pod:402 ../format/virt-format.pod:197
#: ../inspector/virt-inspector.pod:513 ../make-fs/virt-make-fs.pod:231
#: ../p2v/virt-p2v-make-disk.pod:112 ../p2v/virt-p2v-make-kickstart.pod:205
-#: ../p2v/virt-p2v.pod:601 ../rescue/virt-rescue.pod:424
+#: ../p2v/virt-p2v.pod:604 ../rescue/virt-rescue.pod:424
#: ../resize/virt-resize.pod:781 ../sparsify/virt-sparsify.pod:454
#: ../sysprep/virt-sysprep.pod:578 ../tools/virt-list-filesystems:195
#: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
@@ -1556,7 +1556,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../inspector/virt-inspector.pod:521 ../java/examples/guestfs-java.pod:175
#: ../lua/examples/guestfs-lua.pod:155 ../make-fs/virt-make-fs.pod:233
#: ../ocaml/examples/guestfs-ocaml.pod:95 ../p2v/virt-p2v-make-disk.pod:114
-#: ../p2v/virt-p2v-make-kickstart.pod:207 ../p2v/virt-p2v.pod:609
+#: ../p2v/virt-p2v-make-kickstart.pod:207 ../p2v/virt-p2v.pod:612
#: ../perl/examples/guestfs-perl.pod:57
#: ../python/examples/guestfs-python.pod:69 ../rescue/virt-rescue.pod:426
#: ../resize/virt-resize.pod:783 ../ruby/examples/guestfs-ruby.pod:52
@@ -1928,7 +1928,7 @@ msgstr ""
#: ../inspector/virt-inspector.pod:507 ../java/examples/guestfs-java.pod:171
#: ../lua/examples/guestfs-lua.pod:151 ../ocaml/examples/guestfs-ocaml.pod:91
#: ../p2v/virt-p2v-make-disk.pod:110 ../p2v/virt-p2v-make-kickstart.pod:203
-#: ../p2v/virt-p2v.pod:595 ../perl/examples/guestfs-perl.pod:53
+#: ../p2v/virt-p2v.pod:598 ../perl/examples/guestfs-perl.pod:53
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4847
#: ../sysprep/virt-sysprep.pod:576 ../test-tool/libguestfs-test-tool.pod:184
@@ -1960,7 +1960,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:689
#: ../fish/guestfish.pod:1636 ../fuse/guestmount.pod:448
#: ../guestfs-release-notes.pod:3522 ../p2v/virt-p2v-make-disk.pod:116
-#: ../p2v/virt-p2v-make-kickstart.pod:209 ../p2v/virt-p2v.pod:611
+#: ../p2v/virt-p2v-make-kickstart.pod:209 ../p2v/virt-p2v.pod:614
#: ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4853
#: ../test-tool/libguestfs-test-tool.pod:190 ../tools/virt-list-partitions:280
#: ../v2v/virt-v2v.pod:1535
@@ -2415,7 +2415,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:182 ../builder/virt-index-validate.pod:64
#: ../p2v/virt-p2v-make-disk.pod:55 ../p2v/virt-p2v-make-kickstart.pod:141
-#: ../p2v/virt-p2v.pod:441 ../resize/virt-resize.pod:272
+#: ../p2v/virt-p2v.pod:444 ../resize/virt-resize.pod:272
#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:241
msgid "Display help."
msgstr "ヘルプを表示します。"
@@ -7902,7 +7902,7 @@ msgstr ""
#: ../guestfs-release-notes.pod:1071 ../guestfs-release-notes.pod:1075
#: ../guestfs-release-notes.pod:1420 ../guestfs-release-notes.pod:1424
#: ../guestfs-release-notes.pod:1976 ../guestfs-release-notes.pod:1980
-#: ../p2v/virt-p2v.pod:425 ../p2v/virt-p2v.pod:431
+#: ../p2v/virt-p2v.pod:428 ../p2v/virt-p2v.pod:434
#: ../src/guestfs-actions.pod:1 ../src/guestfs-actions.pod:24
#: ../src/guestfs-availability.pod:1 ../src/guestfs-availability.pod:24
#: ../src/guestfs-structs.pod:1 ../src/guestfs-structs.pod:24
@@ -17336,7 +17336,7 @@ msgstr ""
#. type: =item
#: ../fish/guestfish-actions.pod:263 ../fish/guestfish-actions.pod:5068
-#: ../p2v/virt-p2v.pod:499 ../src/guestfs-actions.pod:361
+#: ../p2v/virt-p2v.pod:502 ../src/guestfs-actions.pod:361
#: ../src/guestfs-actions.pod:8075
msgid "C<name>"
msgstr "C<name>"
@@ -53634,23 +53634,28 @@ msgstr ""
#. type: textblock
#: ../p2v/virt-p2v.pod:341
msgid ""
-"The size of the guest memory. You can specify this in megabytes or "
-"gigabytes by using (eg) C<p2v.memory=1024M> or C<p2v.memory=1G>. The "
-"default is to use the same amount of RAM as on the physical machine."
+"The size of the guest memory. You must specify the unit as either megabytes "
+"or gigabytes by using (eg) C<p2v.memory=1024M> or C<p2v.memory=1G>."
msgstr ""
-#. type: =item
+#. type: textblock
#: ../p2v/virt-p2v.pod:345
+msgid ""
+"The default is to use the same amount of RAM as on the physical machine."
+msgstr ""
+
+#. type: =item
+#: ../p2v/virt-p2v.pod:348
msgid "B<p2v.debug>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:347
+#: ../p2v/virt-p2v.pod:350
msgid "Use this to enable full debugging of virt-v2v."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:349
+#: ../p2v/virt-p2v.pod:352
msgid ""
"If asked to diagnose a problem with virt-p2v, you should add C<p2v.debug> to "
"the kernel command line, and examine the log file which is left in C</tmp> "
@@ -53658,17 +53663,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:353
+#: ../p2v/virt-p2v.pod:356
msgid "B<p2v.disks=sdX,sdY,..>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:355
+#: ../p2v/virt-p2v.pod:358
msgid "A list of physical hard disks to convert, for example:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:357
+#: ../p2v/virt-p2v.pod:360
#, no-wrap
msgid ""
" p2v.disks=sda,sdc\n"
@@ -53676,17 +53681,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:359
+#: ../p2v/virt-p2v.pod:362
msgid "The default is to convert all local hard disks that are found."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:361
+#: ../p2v/virt-p2v.pod:364
msgid "B<p2v.removable=srX,srY,..>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:363
+#: ../p2v/virt-p2v.pod:366
msgid ""
"A list of removable media to convert. The default is to create virtual "
"removable devices for every physical removable device found. Note that the "
@@ -53694,24 +53699,24 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:367
+#: ../p2v/virt-p2v.pod:370
msgid "B<p2v.interfaces=em1,..>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:369
+#: ../p2v/virt-p2v.pod:372
msgid ""
"A list of network interfaces to convert. The default is to create virtual "
"network interfaces for every physical network interface found."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:372
+#: ../p2v/virt-p2v.pod:375
msgid "B<p2v.network=interface:target,...>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:374
+#: ../p2v/virt-p2v.pod:377
msgid ""
"Controls how network interfaces are connected to virtual networks on the "
"target hypervisor. The default is to connect all network interfaces to the "
@@ -53719,14 +53724,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:378
+#: ../p2v/virt-p2v.pod:381
msgid ""
"You give a comma-separated list of C<interface:target> pairs, plus "
"optionally a default target. For example:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:381
+#: ../p2v/virt-p2v.pod:384
#, no-wrap
msgid ""
" p2v.network=em1:rhevm\n"
@@ -53734,12 +53739,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:383
+#: ../p2v/virt-p2v.pod:386
msgid "maps interface C<em1> to target network C<rhevm>."
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:385
+#: ../p2v/virt-p2v.pod:388
#, no-wrap
msgid ""
" p2v.network=em1:rhevm,em2:management,other\n"
@@ -53747,136 +53752,136 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:387
+#: ../p2v/virt-p2v.pod:390
msgid ""
"maps interface C<em1> to C<rhevm>, and C<em2> to C<management>, and any "
"other interface that is found to C<other>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:390
+#: ../p2v/virt-p2v.pod:393
msgid "B<p2v.o=[libvirt|local|...]>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:392
+#: ../p2v/virt-p2v.pod:395
msgid ""
"Set the output mode. This is the same as the virt-v2v I<-o> option. See "
"L<virt-v2v(1)/OPTIONS>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:395
+#: ../p2v/virt-p2v.pod:398
msgid ""
"If not specified, the default is C<local>, and the converted guest is "
"written to C</var/tmp>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:398
+#: ../p2v/virt-p2v.pod:401
msgid "B<p2v.oa=sparse|preallocated>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:400
+#: ../p2v/virt-p2v.pod:403
msgid ""
"Set the output allocation mode. This is the same as the virt-v2v I<-oa> "
"option. See L<virt-v2v(1)/OPTIONS>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:403
+#: ../p2v/virt-p2v.pod:406
msgid "B<p2v.oc=...>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:405
+#: ../p2v/virt-p2v.pod:408
msgid ""
"Set the output connection libvirt URI. This is the same as the virt-v2v I<-"
"oc> option. See L<virt-v2v(1)/OPTIONS> and L<http://libvirt.org/uri.html>"
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:409
+#: ../p2v/virt-p2v.pod:412
msgid "B<p2v.of=raw|qcow2|...>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:411
+#: ../p2v/virt-p2v.pod:414
msgid ""
"Set the output format. This is the same as the virt-v2v I<-of> option. See "
"L<virt-v2v(1)/OPTIONS>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:414
+#: ../p2v/virt-p2v.pod:417
msgid "B<p2v.os=...>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:416
+#: ../p2v/virt-p2v.pod:419
msgid ""
"Set the output storage. This is the same as the virt-v2v I<-os> option. "
"See L<virt-v2v(1)/OPTIONS>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:419
+#: ../p2v/virt-p2v.pod:422
msgid ""
"If not specified, the default is C</var/tmp> (on the conversion server)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:421
+#: ../p2v/virt-p2v.pod:424
msgid "B<ip=dhcp>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:423
+#: ../p2v/virt-p2v.pod:426
msgid "Use DHCP for configuring the network interface (this is the default)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:427
+#: ../p2v/virt-p2v.pod:430
msgid "B<ip=ADDR:GATEWAY:NETMASK>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:429
+#: ../p2v/virt-p2v.pod:432
msgid "Set up a static IPv4 network configuration."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:443
+#: ../p2v/virt-p2v.pod:446
msgid "B<--cmdline=CMDLINE>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:445
+#: ../p2v/virt-p2v.pod:448
msgid ""
"This is used for debugging. Instead of parsing the kernel command line from "
"C</proc/cmdline>, parse the string parameter C<CMDLINE>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:452
+#: ../p2v/virt-p2v.pod:455
msgid "Enable debugging (on the conversion server)."
msgstr ""
#. type: =head1
-#: ../p2v/virt-p2v.pod:462
+#: ../p2v/virt-p2v.pod:465
msgid "HOW VIRT-P2V WORKS"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:464
+#: ../p2v/virt-p2v.pod:467
msgid ""
"B<Note this section is not normative.> We may change how virt-p2v works at "
"any time in the future."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:467
+#: ../p2v/virt-p2v.pod:470
msgid ""
"As described above, virt-p2v runs on a physical machine, interrogates the "
"user or the kernel command line for configuration, and then establishes one "
@@ -53888,7 +53893,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:475
+#: ../p2v/virt-p2v.pod:478
msgid ""
"It will first make one or more test connections, which are used to query the "
"remote version of virt-v2v and its features. The test connections are "
@@ -53896,7 +53901,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:479
+#: ../p2v/virt-p2v.pod:482
#, no-wrap
msgid ""
" ┌──────────────┐ ┌─────────────────┐\n"
@@ -53908,7 +53913,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:485
+#: ../p2v/virt-p2v.pod:488
msgid ""
"Once virt-p2v is ready to start conversion, it will open a single ssh "
"control connection. It first sends a mkdir command to create a temporary "
@@ -53917,7 +53922,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:490
+#: ../p2v/virt-p2v.pod:493
#, no-wrap
msgid ""
" /tmp/virt-p2v-YYYYMMDD-XXXXXXXX\n"
@@ -53925,40 +53930,40 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:492
+#: ../p2v/virt-p2v.pod:495
msgid ""
"where C<YYYYMMDD> is the current date, and the X's are random characters."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:495
+#: ../p2v/virt-p2v.pod:498
msgid "Into this directory are written various files which include:"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:501 ../p2v/virt-p2v.pod:507 ../p2v/virt-p2v.pod:526
+#: ../p2v/virt-p2v.pod:504 ../p2v/virt-p2v.pod:510 ../p2v/virt-p2v.pod:529
msgid "I<before conversion>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:503
+#: ../p2v/virt-p2v.pod:506
msgid "The name (usually the hostname) of the physical machine."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:505
+#: ../p2v/virt-p2v.pod:508
msgid "C<physical.xml>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:509
+#: ../p2v/virt-p2v.pod:512
msgid ""
"Libvirt XML describing the physical machine. It is used to pass data about "
"the physical source host to L<virt-v2v(1)> via the I<-i libvirtxml> option."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:513
+#: ../p2v/virt-p2v.pod:516
msgid ""
"Note this is not \"real\" libvirt XML (and must B<never> be loaded into "
"libvirt, which would reject it anyhow). Also it is not the same as the "
@@ -53966,44 +53971,44 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:517
+#: ../p2v/virt-p2v.pod:520
msgid "C<status>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:519
+#: ../p2v/virt-p2v.pod:522
msgid "I<after conversion>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:521
+#: ../p2v/virt-p2v.pod:524
msgid ""
"The final status of the conversion. C<0> if the conversion was successful. "
"Non-zero if the conversion failed."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:524
+#: ../p2v/virt-p2v.pod:527
msgid "C<time>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:528
+#: ../p2v/virt-p2v.pod:531
msgid "The start date/time of conversion."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:530
+#: ../p2v/virt-p2v.pod:533
msgid "C<virt-v2v-conversion-log.txt>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:532
+#: ../p2v/virt-p2v.pod:535
msgid "I<during/after conversion>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:534
+#: ../p2v/virt-p2v.pod:537
msgid ""
"The conversion log. This is just the output of the virt-v2v command on the "
"conversion server. If conversion fails, you should examine this log file, "
@@ -54012,7 +54017,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:541
+#: ../p2v/virt-p2v.pod:544
msgid ""
"Before conversion actually begins, virt-p2v then makes one or more further "
"ssh connections to the server for data transfer. The transfer protocol used "
@@ -54023,7 +54028,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:548
+#: ../p2v/virt-p2v.pod:551
#, no-wrap
msgid ""
" ┌──────────────┐ ┌─────────────────┐\n"
@@ -54041,7 +54046,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:560
+#: ../p2v/virt-p2v.pod:563
msgid ""
"Although the ssh data connection is originated from the physical server and "
"terminates on the conversion server, in fact NBD requests flow in the "
@@ -54054,7 +54059,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:569
+#: ../p2v/virt-p2v.pod:572
msgid ""
"Two layers of protection are used to ensure that there are no writes to the "
"hard disks: Firstly, the qemu-nbd I<-r> (readonly) option is used. Secondly "
@@ -54063,7 +54068,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:575
+#: ../p2v/virt-p2v.pod:578
msgid ""
"The final step is to send the S<C<virt-v2v -i libvirtxml physical.xml ...>> "
"command to the conversion server over the control connection. This "
@@ -54072,7 +54077,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:580
+#: ../p2v/virt-p2v.pod:583
msgid ""
"Output from the virt-v2v command (messages, debugging etc) is saved both in "
"the log file on the conversion server, and sent over the control connection "
@@ -54080,7 +54085,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:586
+#: ../p2v/virt-p2v.pod:589
#, fuzzy
#| msgid ""
#| "L<guestfish(1)>, L<virt-cat(1)>, L<virt-copy-in(1)>, L<virt-copy-out(1)>, "
@@ -54096,27 +54101,27 @@ msgstr ""
"org/>."
#. type: textblock
-#: ../p2v/virt-p2v.pod:597 ../v2v/virt-v2v.pod:1525
+#: ../p2v/virt-p2v.pod:600 ../v2v/virt-v2v.pod:1525
msgid "Matthew Booth"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:599
+#: ../p2v/virt-p2v.pod:602
msgid "John Eckersberg"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:603 ../v2v/virt-v2v.pod:1527
+#: ../p2v/virt-p2v.pod:606 ../v2v/virt-v2v.pod:1527
msgid "Mike Latimer"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:605
+#: ../p2v/virt-p2v.pod:608
msgid "Pino Toscano"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:607 ../v2v/virt-v2v.pod:1531
+#: ../p2v/virt-p2v.pod:610 ../v2v/virt-v2v.pod:1531
msgid "Tingting Zheng"
msgstr ""
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index af72bcd..a421578 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.28.10\n"
+"Project-Id-Version: libguestfs 1.28.11\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2015-05-06 17:30+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+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"
@@ -246,12 +246,12 @@ msgid "If you just want the exit code with no output, use the I<-q> option."
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:101 ../appliance/libguestfs-make-fixed-appliance.pod:97 ../builder/virt-builder.pod:176 ../builder/virt-index-validate.pod:19 ../cat/virt-cat.pod:51 ../cat/virt-filesystems.pod:89 ../cat/virt-log.pod:34 ../cat/virt-ls.pod:249 ../customize/virt-customize.pod:27 ../daemon/guestfsd.pod:43 ../df/virt-df.pod:71 ../diff/virt-diff.pod:35 ../edit/virt-edit.pod:60 ../fish/guestfish.pod:152 ../fish/virt-copy-in.pod:43 ../fish/virt-copy-out.pod:32 ../fish/virt-ta [...]
+#: ../align/virt-alignment-scan.pod:101 ../appliance/libguestfs-make-fixed-appliance.pod:97 ../builder/virt-builder.pod:176 ../builder/virt-index-validate.pod:19 ../cat/virt-cat.pod:51 ../cat/virt-filesystems.pod:89 ../cat/virt-log.pod:34 ../cat/virt-ls.pod:249 ../customize/virt-customize.pod:27 ../daemon/guestfsd.pod:43 ../df/virt-df.pod:71 ../diff/virt-diff.pod:35 ../edit/virt-edit.pod:60 ../fish/guestfish.pod:152 ../fish/virt-copy-in.pod:43 ../fish/virt-copy-out.pod:32 ../fish/virt-ta [...]
msgid "OPTIONS"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:105 ../appliance/libguestfs-make-fixed-appliance.pod:101 ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:62 ../cat/virt-cat.pod:55 ../cat/virt-filesystems.pod:93 ../cat/virt-log.pod:38 ../cat/virt-ls.pod:253 ../customize/virt-customize.pod:31 ../daemon/guestfsd.pod:49 ../df/virt-df.pod:75 ../diff/virt-diff.pod:39 ../edit/virt-edit.pod:64 ../fish/guestfish.pod:156 ../format/virt-format.pod:61 ../fuse/guestmount.pod:240 ../fuse/guestun [...]
+#: ../align/virt-alignment-scan.pod:105 ../appliance/libguestfs-make-fixed-appliance.pod:101 ../builder/virt-builder.pod:180 ../builder/virt-index-validate.pod:62 ../cat/virt-cat.pod:55 ../cat/virt-filesystems.pod:93 ../cat/virt-log.pod:38 ../cat/virt-ls.pod:253 ../customize/virt-customize.pod:31 ../daemon/guestfsd.pod:49 ../df/virt-df.pod:75 ../diff/virt-diff.pod:39 ../edit/virt-edit.pod:64 ../fish/guestfish.pod:156 ../format/virt-format.pod:61 ../fuse/guestmount.pod:240 ../fuse/guestun [...]
msgid "B<--help>"
msgstr ""
@@ -458,12 +458,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:193 ../builder/virt-builder.pod:490 ../cat/virt-cat.pod:165 ../cat/virt-filesystems.pod:265 ../cat/virt-log.pod:112 ../cat/virt-ls.pod:455 ../customize/virt-customize.pod:190 ../daemon/guestfsd.pod:60 ../df/virt-df.pod:183 ../diff/virt-diff.pod:197 ../edit/virt-edit.pod:203 ../fish/guestfish.pod:419 ../format/virt-format.pod:153 ../fuse/guestmount.pod:372 ../inspector/virt-inspector.pod:122 ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:448 ../res [...]
+#: ../align/virt-alignment-scan.pod:193 ../builder/virt-builder.pod:490 ../cat/virt-cat.pod:165 ../cat/virt-filesystems.pod:265 ../cat/virt-log.pod:112 ../cat/virt-ls.pod:455 ../customize/virt-customize.pod:190 ../daemon/guestfsd.pod:60 ../df/virt-df.pod:183 ../diff/virt-diff.pod:197 ../edit/virt-edit.pod:203 ../fish/guestfish.pod:419 ../format/virt-format.pod:153 ../fuse/guestmount.pod:372 ../inspector/virt-inspector.pod:122 ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:451 ../res [...]
msgid "B<-v>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:492 ../cat/virt-cat.pod:167 ../cat/virt-filesystems.pod:267 ../cat/virt-log.pod:114 ../cat/virt-ls.pod:457 ../customize/virt-customize.pod:192 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185 ../diff/virt-diff.pod:199 ../edit/virt-edit.pod:205 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:374 ../inspector/virt-inspector.pod:124 ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:450 ../res [...]
+#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:492 ../cat/virt-cat.pod:167 ../cat/virt-filesystems.pod:267 ../cat/virt-log.pod:114 ../cat/virt-ls.pod:457 ../customize/virt-customize.pod:192 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185 ../diff/virt-diff.pod:199 ../edit/virt-edit.pod:205 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:374 ../inspector/virt-inspector.pod:124 ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:453 ../res [...]
msgid "B<--verbose>"
msgstr ""
@@ -473,17 +473,17 @@ msgid "Enable verbose messages for debugging."
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:199 ../appliance/libguestfs-make-fixed-appliance.pod:105 ../builder/virt-builder.pod:499 ../builder/virt-index-validate.pod:66 ../cat/virt-cat.pod:171 ../cat/virt-filesystems.pod:271 ../cat/virt-log.pod:118 ../cat/virt-ls.pod:461 ../customize/virt-customize.pod:196 ../df/virt-df.pod:189 ../diff/virt-diff.pod:203 ../edit/virt-edit.pod:209 ../fish/guestfish.pod:426 ../format/virt-format.pod:159 ../fuse/guestmount.pod:378 ../fuse/guestunmount.pod:105 ../i [...]
+#: ../align/virt-alignment-scan.pod:199 ../appliance/libguestfs-make-fixed-appliance.pod:105 ../builder/virt-builder.pod:499 ../builder/virt-index-validate.pod:66 ../cat/virt-cat.pod:171 ../cat/virt-filesystems.pod:271 ../cat/virt-log.pod:118 ../cat/virt-ls.pod:461 ../customize/virt-customize.pod:196 ../df/virt-df.pod:189 ../diff/virt-diff.pod:203 ../edit/virt-edit.pod:209 ../fish/guestfish.pod:426 ../format/virt-format.pod:159 ../fuse/guestmount.pod:378 ../fuse/guestunmount.pod:105 ../i [...]
msgid "B<-V>"
msgstr ""
#. type: =item
-#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:501 ../builder/virt-index-validate.pod:68 ../cat/virt-cat.pod:173 ../cat/virt-filesystems.pod:273 ../cat/virt-log.pod:120 ../cat/virt-ls.pod:463 ../customize/virt-customize.pod:198 ../df/virt-df.pod:191 ../diff/virt-diff.pod:205 ../edit/virt-edit.pod:211 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:380 ../fuse/guestunmount.pod:107 ../i [...]
+#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:501 ../builder/virt-index-validate.pod:68 ../cat/virt-cat.pod:173 ../cat/virt-filesystems.pod:273 ../cat/virt-log.pod:120 ../cat/virt-ls.pod:463 ../customize/virt-customize.pod:198 ../df/virt-df.pod:191 ../diff/virt-diff.pod:205 ../edit/virt-edit.pod:211 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:380 ../fuse/guestunmount.pod:107 ../i [...]
msgid "B<--version>"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:203 ../builder/virt-builder.pod:503 ../builder/virt-index-validate.pod:70 ../cat/virt-cat.pod:175 ../cat/virt-filesystems.pod:275 ../cat/virt-log.pod:122 ../cat/virt-ls.pod:465 ../customize/virt-customize.pod:200 ../df/virt-df.pod:193 ../diff/virt-diff.pod:207 ../edit/virt-edit.pod:213 ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:132 ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v-make-disk.pod:68 ../p2v/virt-p2v-make-kickstart.pod:158 [...]
+#: ../align/virt-alignment-scan.pod:203 ../builder/virt-builder.pod:503 ../builder/virt-index-validate.pod:70 ../cat/virt-cat.pod:175 ../cat/virt-filesystems.pod:275 ../cat/virt-log.pod:122 ../cat/virt-ls.pod:465 ../customize/virt-customize.pod:200 ../df/virt-df.pod:193 ../diff/virt-diff.pod:207 ../edit/virt-edit.pod:213 ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:132 ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v-make-disk.pod:68 ../p2v/virt-p2v-make-kickstart.pod:158 [...]
msgid "Display version number and exit."
msgstr ""
@@ -823,7 +823,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1697 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:254 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:389 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../examples [...]
+#: ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:164 ../builder/virt-builder.pod:1697 ../builder/virt-index-validate.pod:79 ../cat/virt-cat.pod:273 ../cat/virt-filesystems.pod:386 ../cat/virt-log.pod:135 ../cat/virt-ls.pod:518 ../customize/virt-customize.pod:254 ../daemon/guestfsd.pod:115 ../df/virt-df.pod:256 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:389 ../erlang/examples/guestfs-erlang.pod:95 ../examples/guestfs-examples.pod:55 ../examples [...]
msgid "SEE ALSO"
msgstr ""
@@ -840,12 +840,12 @@ msgid "AUTHOR"
msgstr ""
#. type: textblock
-#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1718 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:285 ../cat/virt-filesystems.pod:399 ../cat/virt-log.pod:147 ../cat/virt-ls.pod:530 ../customize/virt-customize.pod:273 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:266 ../diff/virt-diff.pod:260 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:513 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v-make-disk.pod:112 ../p2v/vi [...]
+#: ../align/virt-alignment-scan.pod:395 ../builder/virt-builder.pod:1718 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:285 ../cat/virt-filesystems.pod:399 ../cat/virt-log.pod:147 ../cat/virt-ls.pod:530 ../customize/virt-customize.pod:273 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:266 ../diff/virt-diff.pod:260 ../edit/virt-edit.pod:402 ../format/virt-format.pod:197 ../inspector/virt-inspector.pod:513 ../make-fs/virt-make-fs.pod:231 ../p2v/virt-p2v-make-disk.pod:112 ../p2v/vi [...]
msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
msgstr ""
#. type: =head1
-#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1720 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:275 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:262 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
+#: ../align/virt-alignment-scan.pod:397 ../appliance/libguestfs-make-fixed-appliance.pod:176 ../builder/virt-builder.pod:1720 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:287 ../cat/virt-filesystems.pod:401 ../cat/virt-log.pod:149 ../cat/virt-ls.pod:532 ../customize/virt-customize.pod:275 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:268 ../diff/virt-diff.pod:262 ../edit/virt-edit.pod:404 ../erlang/examples/guestfs-erlang.pod:114 ../examples/guestfs-examples.pod:73 ../example [...]
msgid "COPYRIGHT"
msgstr ""
@@ -1148,7 +1148,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:172 ../customize/virt-customize.pod:271 ../erlang/examples/guestfs-erlang.pod:110 ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1268 ../examples/guestfs-performance.pod:573 ../examples/guestfs-recipes.pod:683 ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1630 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:56 ../fish/virt-tar-out.pod:49 . [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:172 ../customize/virt-customize.pod:271 ../erlang/examples/guestfs-erlang.pod:110 ../examples/guestfs-examples.pod:69 ../examples/guestfs-faq.pod:1268 ../examples/guestfs-performance.pod:573 ../examples/guestfs-recipes.pod:683 ../examples/guestfs-testing.pod:391 ../fish/guestfish.pod:1630 ../fish/libguestfs-tools.conf.pod:96 ../fish/virt-copy-in.pod:58 ../fish/virt-copy-out.pod:47 ../fish/virt-tar-in.pod:56 ../fish/virt-tar-out.pod:49 . [...]
msgid "AUTHORS"
msgstr ""
@@ -1158,7 +1158,7 @@ msgid "Richard W.M. Jones (C<rjones at redhat dot com>)"
msgstr ""
#. type: textblock
-#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:264 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:689 ../fish/guestfish.pod:1636 ../fuse/guestmount.pod:448 ../guestfs-release-notes.pod:3522 ../p2v/virt-p2v-make-disk.pod:116 ../p2v/virt-p2v-make-kickstart.pod:209 ../p2v/virt-p2v.pod:611 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4853 ../test-tool/libguestfs-test-tool.pod [...]
+#: ../appliance/libguestfs-make-fixed-appliance.pod:178 ../cat/virt-ls.pod:534 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:270 ../diff/virt-diff.pod:264 ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:689 ../fish/guestfish.pod:1636 ../fuse/guestmount.pod:448 ../guestfs-release-notes.pod:3522 ../p2v/virt-p2v-make-disk.pod:116 ../p2v/virt-p2v-make-kickstart.pod:209 ../p2v/virt-p2v.pod:614 ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4853 ../test-tool/libguestfs-test-tool.pod [...]
msgid "Copyright (C) 2009-2014 Red Hat Inc."
msgstr ""
@@ -1595,7 +1595,7 @@ msgid "You can combine these options, and have multiple options of all types."
msgstr ""
#. type: textblock
-#: ../builder/virt-builder.pod:182 ../builder/virt-index-validate.pod:64 ../p2v/virt-p2v-make-disk.pod:55 ../p2v/virt-p2v-make-kickstart.pod:141 ../p2v/virt-p2v.pod:441 ../resize/virt-resize.pod:272 ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:241
+#: ../builder/virt-builder.pod:182 ../builder/virt-index-validate.pod:64 ../p2v/virt-p2v-make-disk.pod:55 ../p2v/virt-p2v-make-kickstart.pod:141 ../p2v/virt-p2v.pod:444 ../resize/virt-resize.pod:272 ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:241
msgid "Display help."
msgstr ""
@@ -6691,7 +6691,7 @@ msgid ""
msgstr ""
#. type: =end
-#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:24 ../examples/guestfs-recipes.pod:1 ../examples/guestfs-recipes.pod:6 ../fish/guestfish-actions.pod:1 ../fish/guestfish-actions.pod:24 ../fish/guestfish-commands.pod:1 ../fish/guestfish-commands.pod:24 ../fish/guestfish-prepopts.pod:1 ../fish/guestfish-prepopts.pod:24 ../guestfs-release-notes.pod:5 ../guestfs-release-notes.pod:9 ../guestfs-release-notes.pod:11 ../guestfs-release-notes.pod:18 ../guestfs-release-no [...]
+#: ../customize/customize-options.pod:1 ../customize/customize-options.pod:24 ../examples/guestfs-recipes.pod:1 ../examples/guestfs-recipes.pod:6 ../fish/guestfish-actions.pod:1 ../fish/guestfish-actions.pod:24 ../fish/guestfish-commands.pod:1 ../fish/guestfish-commands.pod:24 ../fish/guestfish-prepopts.pod:1 ../fish/guestfish-prepopts.pod:24 ../guestfs-release-notes.pod:5 ../guestfs-release-notes.pod:9 ../guestfs-release-notes.pod:11 ../guestfs-release-notes.pod:18 ../guestfs-release-no [...]
msgid "comment"
msgstr ""
@@ -15189,7 +15189,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../fish/guestfish-actions.pod:263 ../fish/guestfish-actions.pod:5068 ../p2v/virt-p2v.pod:499 ../src/guestfs-actions.pod:361 ../src/guestfs-actions.pod:8075
+#: ../fish/guestfish-actions.pod:263 ../fish/guestfish-actions.pod:5068 ../p2v/virt-p2v.pod:502 ../src/guestfs-actions.pod:361 ../src/guestfs-actions.pod:8075
msgid "C<name>"
msgstr ""
@@ -49212,23 +49212,27 @@ msgstr ""
#. type: textblock
#: ../p2v/virt-p2v.pod:341
msgid ""
-"The size of the guest memory. You can specify this in megabytes or "
-"gigabytes by using (eg) C<p2v.memory=1024M> or C<p2v.memory=1G>. The "
-"default is to use the same amount of RAM as on the physical machine."
+"The size of the guest memory. You must specify the unit as either megabytes "
+"or gigabytes by using (eg) C<p2v.memory=1024M> or C<p2v.memory=1G>."
msgstr ""
-#. type: =item
+#. type: textblock
#: ../p2v/virt-p2v.pod:345
+msgid "The default is to use the same amount of RAM as on the physical machine."
+msgstr ""
+
+#. type: =item
+#: ../p2v/virt-p2v.pod:348
msgid "B<p2v.debug>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:347
+#: ../p2v/virt-p2v.pod:350
msgid "Use this to enable full debugging of virt-v2v."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:349
+#: ../p2v/virt-p2v.pod:352
msgid ""
"If asked to diagnose a problem with virt-p2v, you should add C<p2v.debug> to "
"the kernel command line, and examine the log file which is left in C</tmp> "
@@ -49236,17 +49240,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:353
+#: ../p2v/virt-p2v.pod:356
msgid "B<p2v.disks=sdX,sdY,..>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:355
+#: ../p2v/virt-p2v.pod:358
msgid "A list of physical hard disks to convert, for example:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:357
+#: ../p2v/virt-p2v.pod:360
#, no-wrap
msgid ""
" p2v.disks=sda,sdc\n"
@@ -49254,17 +49258,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:359
+#: ../p2v/virt-p2v.pod:362
msgid "The default is to convert all local hard disks that are found."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:361
+#: ../p2v/virt-p2v.pod:364
msgid "B<p2v.removable=srX,srY,..>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:363
+#: ../p2v/virt-p2v.pod:366
msgid ""
"A list of removable media to convert. The default is to create virtual "
"removable devices for every physical removable device found. Note that the "
@@ -49272,24 +49276,24 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:367
+#: ../p2v/virt-p2v.pod:370
msgid "B<p2v.interfaces=em1,..>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:369
+#: ../p2v/virt-p2v.pod:372
msgid ""
"A list of network interfaces to convert. The default is to create virtual "
"network interfaces for every physical network interface found."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:372
+#: ../p2v/virt-p2v.pod:375
msgid "B<p2v.network=interface:target,...>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:374
+#: ../p2v/virt-p2v.pod:377
msgid ""
"Controls how network interfaces are connected to virtual networks on the "
"target hypervisor. The default is to connect all network interfaces to the "
@@ -49297,14 +49301,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:378
+#: ../p2v/virt-p2v.pod:381
msgid ""
"You give a comma-separated list of C<interface:target> pairs, plus "
"optionally a default target. For example:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:381
+#: ../p2v/virt-p2v.pod:384
#, no-wrap
msgid ""
" p2v.network=em1:rhevm\n"
@@ -49312,12 +49316,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:383
+#: ../p2v/virt-p2v.pod:386
msgid "maps interface C<em1> to target network C<rhevm>."
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:385
+#: ../p2v/virt-p2v.pod:388
#, no-wrap
msgid ""
" p2v.network=em1:rhevm,em2:management,other\n"
@@ -49325,50 +49329,50 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:387
+#: ../p2v/virt-p2v.pod:390
msgid ""
"maps interface C<em1> to C<rhevm>, and C<em2> to C<management>, and any "
"other interface that is found to C<other>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:390
+#: ../p2v/virt-p2v.pod:393
msgid "B<p2v.o=[libvirt|local|...]>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:392
+#: ../p2v/virt-p2v.pod:395
msgid ""
"Set the output mode. This is the same as the virt-v2v I<-o> option. See "
"L<virt-v2v(1)/OPTIONS>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:395
+#: ../p2v/virt-p2v.pod:398
msgid ""
"If not specified, the default is C<local>, and the converted guest is "
"written to C</var/tmp>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:398
+#: ../p2v/virt-p2v.pod:401
msgid "B<p2v.oa=sparse|preallocated>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:400
+#: ../p2v/virt-p2v.pod:403
msgid ""
"Set the output allocation mode. This is the same as the virt-v2v I<-oa> "
"option. See L<virt-v2v(1)/OPTIONS>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:403
+#: ../p2v/virt-p2v.pod:406
msgid "B<p2v.oc=...>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:405
+#: ../p2v/virt-p2v.pod:408
msgid ""
"Set the output connection libvirt URI. This is the same as the virt-v2v "
"I<-oc> option. See L<virt-v2v(1)/OPTIONS> and "
@@ -49376,85 +49380,85 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:409
+#: ../p2v/virt-p2v.pod:412
msgid "B<p2v.of=raw|qcow2|...>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:411
+#: ../p2v/virt-p2v.pod:414
msgid ""
"Set the output format. This is the same as the virt-v2v I<-of> option. See "
"L<virt-v2v(1)/OPTIONS>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:414
+#: ../p2v/virt-p2v.pod:417
msgid "B<p2v.os=...>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:416
+#: ../p2v/virt-p2v.pod:419
msgid ""
"Set the output storage. This is the same as the virt-v2v I<-os> option. "
"See L<virt-v2v(1)/OPTIONS>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:419
+#: ../p2v/virt-p2v.pod:422
msgid "If not specified, the default is C</var/tmp> (on the conversion server)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:421
+#: ../p2v/virt-p2v.pod:424
msgid "B<ip=dhcp>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:423
+#: ../p2v/virt-p2v.pod:426
msgid "Use DHCP for configuring the network interface (this is the default)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:427
+#: ../p2v/virt-p2v.pod:430
msgid "B<ip=ADDR:GATEWAY:NETMASK>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:429
+#: ../p2v/virt-p2v.pod:432
msgid "Set up a static IPv4 network configuration."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:443
+#: ../p2v/virt-p2v.pod:446
msgid "B<--cmdline=CMDLINE>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:445
+#: ../p2v/virt-p2v.pod:448
msgid ""
"This is used for debugging. Instead of parsing the kernel command line from "
"C</proc/cmdline>, parse the string parameter C<CMDLINE>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:452
+#: ../p2v/virt-p2v.pod:455
msgid "Enable debugging (on the conversion server)."
msgstr ""
#. type: =head1
-#: ../p2v/virt-p2v.pod:462
+#: ../p2v/virt-p2v.pod:465
msgid "HOW VIRT-P2V WORKS"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:464
+#: ../p2v/virt-p2v.pod:467
msgid ""
"B<Note this section is not normative.> We may change how virt-p2v works at "
"any time in the future."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:467
+#: ../p2v/virt-p2v.pod:470
msgid ""
"As described above, virt-p2v runs on a physical machine, interrogates the "
"user or the kernel command line for configuration, and then establishes one "
@@ -49466,7 +49470,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:475
+#: ../p2v/virt-p2v.pod:478
msgid ""
"It will first make one or more test connections, which are used to query the "
"remote version of virt-v2v and its features. The test connections are "
@@ -49474,7 +49478,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:479
+#: ../p2v/virt-p2v.pod:482
#, no-wrap
msgid ""
" ┌──────────────┐ ┌─────────────────┐\n"
@@ -49486,7 +49490,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:485
+#: ../p2v/virt-p2v.pod:488
msgid ""
"Once virt-p2v is ready to start conversion, it will open a single ssh "
"control connection. It first sends a mkdir command to create a temporary "
@@ -49495,7 +49499,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:490
+#: ../p2v/virt-p2v.pod:493
#, no-wrap
msgid ""
" /tmp/virt-p2v-YYYYMMDD-XXXXXXXX\n"
@@ -49503,39 +49507,39 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:492
+#: ../p2v/virt-p2v.pod:495
msgid "where C<YYYYMMDD> is the current date, and the X's are random characters."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:495
+#: ../p2v/virt-p2v.pod:498
msgid "Into this directory are written various files which include:"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:501 ../p2v/virt-p2v.pod:507 ../p2v/virt-p2v.pod:526
+#: ../p2v/virt-p2v.pod:504 ../p2v/virt-p2v.pod:510 ../p2v/virt-p2v.pod:529
msgid "I<before conversion>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:503
+#: ../p2v/virt-p2v.pod:506
msgid "The name (usually the hostname) of the physical machine."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:505
+#: ../p2v/virt-p2v.pod:508
msgid "C<physical.xml>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:509
+#: ../p2v/virt-p2v.pod:512
msgid ""
"Libvirt XML describing the physical machine. It is used to pass data about "
"the physical source host to L<virt-v2v(1)> via the I<-i libvirtxml> option."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:513
+#: ../p2v/virt-p2v.pod:516
msgid ""
"Note this is not \"real\" libvirt XML (and must B<never> be loaded into "
"libvirt, which would reject it anyhow). Also it is not the same as the "
@@ -49543,44 +49547,44 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:517
+#: ../p2v/virt-p2v.pod:520
msgid "C<status>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:519
+#: ../p2v/virt-p2v.pod:522
msgid "I<after conversion>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:521
+#: ../p2v/virt-p2v.pod:524
msgid ""
"The final status of the conversion. C<0> if the conversion was successful. "
"Non-zero if the conversion failed."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:524
+#: ../p2v/virt-p2v.pod:527
msgid "C<time>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:528
+#: ../p2v/virt-p2v.pod:531
msgid "The start date/time of conversion."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:530
+#: ../p2v/virt-p2v.pod:533
msgid "C<virt-v2v-conversion-log.txt>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:532
+#: ../p2v/virt-p2v.pod:535
msgid "I<during/after conversion>"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:534
+#: ../p2v/virt-p2v.pod:537
msgid ""
"The conversion log. This is just the output of the virt-v2v command on the "
"conversion server. If conversion fails, you should examine this log file, "
@@ -49589,7 +49593,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:541
+#: ../p2v/virt-p2v.pod:544
msgid ""
"Before conversion actually begins, virt-p2v then makes one or more further "
"ssh connections to the server for data transfer. The transfer protocol used "
@@ -49600,7 +49604,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:548
+#: ../p2v/virt-p2v.pod:551
#, no-wrap
msgid ""
" ┌──────────────┐ ┌─────────────────┐\n"
@@ -49618,7 +49622,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:560
+#: ../p2v/virt-p2v.pod:563
msgid ""
"Although the ssh data connection is originated from the physical server and "
"terminates on the conversion server, in fact NBD requests flow in the "
@@ -49631,7 +49635,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:569
+#: ../p2v/virt-p2v.pod:572
msgid ""
"Two layers of protection are used to ensure that there are no writes to the "
"hard disks: Firstly, the qemu-nbd I<-r> (readonly) option is used. Secondly "
@@ -49640,7 +49644,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:575
+#: ../p2v/virt-p2v.pod:578
msgid ""
"The final step is to send the S<C<virt-v2v -i libvirtxml physical.xml ...>> "
"command to the conversion server over the control connection. This "
@@ -49649,7 +49653,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:580
+#: ../p2v/virt-p2v.pod:583
msgid ""
"Output from the virt-v2v command (messages, debugging etc) is saved both in "
"the log file on the conversion server, and sent over the control connection "
@@ -49657,7 +49661,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:586
+#: ../p2v/virt-p2v.pod:589
msgid ""
"L<virt-p2v-make-disk(1)>, L<virt-p2v-make-kickstart(1)>, L<virt-v2v(1)>, "
"L<qemu-nbd(1)>, L<ssh(1)>, L<sshd(8)>, L<sshd_config(5)>, "
@@ -49665,27 +49669,27 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:597 ../v2v/virt-v2v.pod:1525
+#: ../p2v/virt-p2v.pod:600 ../v2v/virt-v2v.pod:1525
msgid "Matthew Booth"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:599
+#: ../p2v/virt-p2v.pod:602
msgid "John Eckersberg"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:603 ../v2v/virt-v2v.pod:1527
+#: ../p2v/virt-p2v.pod:606 ../v2v/virt-v2v.pod:1527
msgid "Mike Latimer"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:605
+#: ../p2v/virt-p2v.pod:608
msgid "Pino Toscano"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:607 ../v2v/virt-v2v.pod:1531
+#: ../p2v/virt-p2v.pod:610 ../v2v/virt-v2v.pod:1531
msgid "Tingting Zheng"
msgstr ""
diff --git a/po-docs/uk.po b/po-docs/uk.po
index c0a1c13..8c75a30 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2015-04-26 15:59+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+0100\n"
"PO-Revision-Date: 2014-10-18 08:01+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -397,7 +397,7 @@ msgstr ""
#: ../fuse/guestmount.pod:159 ../fuse/guestunmount.pod:70
#: ../inspector/virt-inspector.pod:52 ../make-fs/virt-make-fs.pod:117
#: ../p2v/virt-p2v-make-disk.pod:49 ../p2v/virt-p2v-make-kickstart.pod:135
-#: ../p2v/virt-p2v.pod:435 ../rescue/virt-rescue.pod:113
+#: ../p2v/virt-p2v.pod:438 ../rescue/virt-rescue.pod:113
#: ../resize/virt-resize.pod:266 ../sparsify/virt-sparsify.pod:114
#: ../sysprep/virt-sysprep.pod:38 ../test-tool/libguestfs-test-tool.pod:34
#: ../tools/virt-list-filesystems:52 ../tools/virt-list-partitions:53
@@ -417,7 +417,7 @@ msgstr "ПАРАМЕТРИ"
#: ../fuse/guestmount.pod:240 ../fuse/guestunmount.pod:79
#: ../inspector/virt-inspector.pod:56 ../make-fs/virt-make-fs.pod:121
#: ../p2v/virt-p2v-make-disk.pod:53 ../p2v/virt-p2v-make-kickstart.pod:139
-#: ../p2v/virt-p2v.pod:439 ../rescue/virt-rescue.pod:117
+#: ../p2v/virt-p2v.pod:442 ../rescue/virt-rescue.pod:117
#: ../resize/virt-resize.pod:270 ../sparsify/virt-sparsify.pod:118
#: ../sysprep/virt-sysprep.pod:42 ../test-tool/libguestfs-test-tool.pod:38
#: ../tools/virt-list-filesystems:60 ../tools/virt-list-partitions:61
@@ -792,7 +792,7 @@ msgstr ""
#: ../df/virt-df.pod:183 ../diff/virt-diff.pod:197 ../edit/virt-edit.pod:203
#: ../fish/guestfish.pod:419 ../format/virt-format.pod:153
#: ../fuse/guestmount.pod:372 ../inspector/virt-inspector.pod:122
-#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:448
+#: ../make-fs/virt-make-fs.pod:197 ../p2v/virt-p2v.pod:451
#: ../rescue/virt-rescue.pod:238 ../resize/virt-resize.pod:581
#: ../sparsify/virt-sparsify.pod:292 ../sysprep/virt-sysprep.pod:222
#: ../v2v/virt-v2v.pod:623
@@ -807,7 +807,7 @@ msgstr "B<-v>"
#: ../df/virt-df.pod:185 ../diff/virt-diff.pod:199 ../edit/virt-edit.pod:205
#: ../fish/guestfish.pod:421 ../format/virt-format.pod:155
#: ../fuse/guestmount.pod:374 ../inspector/virt-inspector.pod:124
-#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:450
+#: ../make-fs/virt-make-fs.pod:199 ../p2v/virt-p2v.pod:453
#: ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:583
#: ../sparsify/virt-sparsify.pod:294 ../sysprep/virt-sysprep.pod:224
#: ../v2v/virt-v2v.pod:625
@@ -838,7 +838,7 @@ msgstr "Увімкнути докладний показ повідомлень
#: ../fuse/guestmount.pod:378 ../fuse/guestunmount.pod:105
#: ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:203
#: ../p2v/virt-p2v-make-disk.pod:64 ../p2v/virt-p2v-make-kickstart.pod:154
-#: ../p2v/virt-p2v.pod:454 ../rescue/virt-rescue.pod:244
+#: ../p2v/virt-p2v.pod:457 ../rescue/virt-rescue.pod:244
#: ../resize/virt-resize.pod:587 ../sparsify/virt-sparsify.pod:298
#: ../sysprep/virt-sysprep.pod:228 ../test-tool/libguestfs-test-tool.pod:59
#: ../v2v/virt-v2v.pod:629
@@ -857,7 +857,7 @@ msgstr "B<-V>"
#: ../fuse/guestmount.pod:380 ../fuse/guestunmount.pod:107
#: ../inspector/virt-inspector.pod:130 ../make-fs/virt-make-fs.pod:205
#: ../p2v/virt-p2v-make-disk.pod:66 ../p2v/virt-p2v-make-kickstart.pod:156
-#: ../p2v/virt-p2v.pod:456 ../rescue/virt-rescue.pod:246
+#: ../p2v/virt-p2v.pod:459 ../rescue/virt-rescue.pod:246
#: ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:300
#: ../sysprep/virt-sysprep.pod:230 ../test-tool/libguestfs-test-tool.pod:61
#: ../tools/virt-list-filesystems:68 ../tools/virt-list-partitions:69
@@ -873,7 +873,7 @@ msgstr "B<--version>"
#: ../df/virt-df.pod:193 ../diff/virt-diff.pod:207 ../edit/virt-edit.pod:213
#: ../format/virt-format.pod:163 ../inspector/virt-inspector.pod:132
#: ../make-fs/virt-make-fs.pod:207 ../p2v/virt-p2v-make-disk.pod:68
-#: ../p2v/virt-p2v-make-kickstart.pod:158 ../p2v/virt-p2v.pod:458
+#: ../p2v/virt-p2v-make-kickstart.pod:158 ../p2v/virt-p2v.pod:461
#: ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:591
#: ../sparsify/virt-sparsify.pod:302 ../sysprep/virt-sysprep.pod:232
#: ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71
@@ -1464,7 +1464,7 @@ msgstr ""
#: ../inspector/virt-inspector.pod:498 ../java/examples/guestfs-java.pod:156
#: ../lua/examples/guestfs-lua.pod:136 ../make-fs/virt-make-fs.pod:215
#: ../ocaml/examples/guestfs-ocaml.pod:76 ../p2v/virt-p2v-make-disk.pod:103
-#: ../p2v/virt-p2v-make-kickstart.pod:194 ../p2v/virt-p2v.pod:584
+#: ../p2v/virt-p2v-make-kickstart.pod:194 ../p2v/virt-p2v.pod:587
#: ../perl/examples/guestfs-perl.pod:38
#: ../python/examples/guestfs-python.pod:51 ../rescue/virt-rescue.pod:412
#: ../resize/virt-resize.pod:755 ../ruby/examples/guestfs-ruby.pod:34
@@ -1507,7 +1507,7 @@ msgstr "АВТОР"
#: ../edit/virt-edit.pod:402 ../format/virt-format.pod:197
#: ../inspector/virt-inspector.pod:513 ../make-fs/virt-make-fs.pod:231
#: ../p2v/virt-p2v-make-disk.pod:112 ../p2v/virt-p2v-make-kickstart.pod:205
-#: ../p2v/virt-p2v.pod:601 ../rescue/virt-rescue.pod:424
+#: ../p2v/virt-p2v.pod:604 ../rescue/virt-rescue.pod:424
#: ../resize/virt-resize.pod:781 ../sparsify/virt-sparsify.pod:454
#: ../sysprep/virt-sysprep.pod:578 ../tools/virt-list-filesystems:195
#: ../tools/virt-list-partitions:276 ../tools/virt-tar:308
@@ -1535,7 +1535,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
#: ../inspector/virt-inspector.pod:521 ../java/examples/guestfs-java.pod:175
#: ../lua/examples/guestfs-lua.pod:155 ../make-fs/virt-make-fs.pod:233
#: ../ocaml/examples/guestfs-ocaml.pod:95 ../p2v/virt-p2v-make-disk.pod:114
-#: ../p2v/virt-p2v-make-kickstart.pod:207 ../p2v/virt-p2v.pod:609
+#: ../p2v/virt-p2v-make-kickstart.pod:207 ../p2v/virt-p2v.pod:612
#: ../perl/examples/guestfs-perl.pod:57
#: ../python/examples/guestfs-python.pod:69 ../rescue/virt-rescue.pod:426
#: ../resize/virt-resize.pod:783 ../ruby/examples/guestfs-ruby.pod:52
@@ -1894,7 +1894,7 @@ msgstr ""
#: ../inspector/virt-inspector.pod:507 ../java/examples/guestfs-java.pod:171
#: ../lua/examples/guestfs-lua.pod:151 ../ocaml/examples/guestfs-ocaml.pod:91
#: ../p2v/virt-p2v-make-disk.pod:110 ../p2v/virt-p2v-make-kickstart.pod:203
-#: ../p2v/virt-p2v.pod:595 ../perl/examples/guestfs-perl.pod:53
+#: ../p2v/virt-p2v.pod:598 ../perl/examples/guestfs-perl.pod:53
#: ../python/examples/guestfs-python.pod:65
#: ../ruby/examples/guestfs-ruby.pod:48 ../src/guestfs.pod:4847
#: ../sysprep/virt-sysprep.pod:576 ../test-tool/libguestfs-test-tool.pod:184
@@ -1926,7 +1926,7 @@ msgstr "Richard W.M. Jones (C<rjones at redhat dot com>)"
#: ../edit/virt-edit.pod:406 ../examples/guestfs-recipes.pod:689
#: ../fish/guestfish.pod:1636 ../fuse/guestmount.pod:448
#: ../guestfs-release-notes.pod:3522 ../p2v/virt-p2v-make-disk.pod:116
-#: ../p2v/virt-p2v-make-kickstart.pod:209 ../p2v/virt-p2v.pod:611
+#: ../p2v/virt-p2v-make-kickstart.pod:209 ../p2v/virt-p2v.pod:614
#: ../rescue/virt-rescue.pod:428 ../src/guestfs.pod:4853
#: ../test-tool/libguestfs-test-tool.pod:190 ../tools/virt-list-partitions:280
#: ../v2v/virt-v2v.pod:1535
@@ -2431,7 +2431,7 @@ msgstr ""
#. type: textblock
#: ../builder/virt-builder.pod:182 ../builder/virt-index-validate.pod:64
#: ../p2v/virt-p2v-make-disk.pod:55 ../p2v/virt-p2v-make-kickstart.pod:141
-#: ../p2v/virt-p2v.pod:441 ../resize/virt-resize.pod:272
+#: ../p2v/virt-p2v.pod:444 ../resize/virt-resize.pod:272
#: ../sparsify/virt-sparsify.pod:120 ../v2v/virt-v2v.pod:241
msgid "Display help."
msgstr "Показати довідкове повідомлення."
@@ -8005,7 +8005,7 @@ msgstr ""
#: ../guestfs-release-notes.pod:1071 ../guestfs-release-notes.pod:1075
#: ../guestfs-release-notes.pod:1420 ../guestfs-release-notes.pod:1424
#: ../guestfs-release-notes.pod:1976 ../guestfs-release-notes.pod:1980
-#: ../p2v/virt-p2v.pod:425 ../p2v/virt-p2v.pod:431
+#: ../p2v/virt-p2v.pod:428 ../p2v/virt-p2v.pod:434
#: ../src/guestfs-actions.pod:1 ../src/guestfs-actions.pod:24
#: ../src/guestfs-availability.pod:1 ../src/guestfs-availability.pod:24
#: ../src/guestfs-structs.pod:1 ../src/guestfs-structs.pod:24
@@ -17336,7 +17336,7 @@ msgstr ""
#. type: =item
#: ../fish/guestfish-actions.pod:263 ../fish/guestfish-actions.pod:5068
-#: ../p2v/virt-p2v.pod:499 ../src/guestfs-actions.pod:361
+#: ../p2v/virt-p2v.pod:502 ../src/guestfs-actions.pod:361
#: ../src/guestfs-actions.pod:8075
msgid "C<name>"
msgstr "C<name>"
@@ -52882,23 +52882,28 @@ msgstr "B<p2v.memory=NN(M|G)>"
#. type: textblock
#: ../p2v/virt-p2v.pod:341
msgid ""
-"The size of the guest memory. You can specify this in megabytes or "
-"gigabytes by using (eg) C<p2v.memory=1024M> or C<p2v.memory=1G>. The "
-"default is to use the same amount of RAM as on the physical machine."
+"The size of the guest memory. You must specify the unit as either megabytes "
+"or gigabytes by using (eg) C<p2v.memory=1024M> or C<p2v.memory=1G>."
msgstr ""
-#. type: =item
+#. type: textblock
#: ../p2v/virt-p2v.pod:345
+msgid ""
+"The default is to use the same amount of RAM as on the physical machine."
+msgstr ""
+
+#. type: =item
+#: ../p2v/virt-p2v.pod:348
msgid "B<p2v.debug>"
msgstr "B<p2v.debug>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:347
+#: ../p2v/virt-p2v.pod:350
msgid "Use this to enable full debugging of virt-v2v."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:349
+#: ../p2v/virt-p2v.pod:352
msgid ""
"If asked to diagnose a problem with virt-p2v, you should add C<p2v.debug> to "
"the kernel command line, and examine the log file which is left in C</tmp> "
@@ -52906,17 +52911,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:353
+#: ../p2v/virt-p2v.pod:356
msgid "B<p2v.disks=sdX,sdY,..>"
msgstr "B<p2v.disks=sdX,sdY,..>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:355
+#: ../p2v/virt-p2v.pod:358
msgid "A list of physical hard disks to convert, for example:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:357
+#: ../p2v/virt-p2v.pod:360
#, no-wrap
msgid ""
" p2v.disks=sda,sdc\n"
@@ -52926,17 +52931,17 @@ msgstr ""
"\n"
#. type: textblock
-#: ../p2v/virt-p2v.pod:359
+#: ../p2v/virt-p2v.pod:362
msgid "The default is to convert all local hard disks that are found."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:361
+#: ../p2v/virt-p2v.pod:364
msgid "B<p2v.removable=srX,srY,..>"
msgstr "B<p2v.removable=srX,srY,..>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:363
+#: ../p2v/virt-p2v.pod:366
msgid ""
"A list of removable media to convert. The default is to create virtual "
"removable devices for every physical removable device found. Note that the "
@@ -52944,24 +52949,24 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:367
+#: ../p2v/virt-p2v.pod:370
msgid "B<p2v.interfaces=em1,..>"
msgstr "B<p2v.interfaces=em1,..>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:369
+#: ../p2v/virt-p2v.pod:372
msgid ""
"A list of network interfaces to convert. The default is to create virtual "
"network interfaces for every physical network interface found."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:372
+#: ../p2v/virt-p2v.pod:375
msgid "B<p2v.network=interface:target,...>"
msgstr "B<p2v.network=інтерфейс:призначення,...>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:374
+#: ../p2v/virt-p2v.pod:377
msgid ""
"Controls how network interfaces are connected to virtual networks on the "
"target hypervisor. The default is to connect all network interfaces to the "
@@ -52969,14 +52974,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:378
+#: ../p2v/virt-p2v.pod:381
msgid ""
"You give a comma-separated list of C<interface:target> pairs, plus "
"optionally a default target. For example:"
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:381
+#: ../p2v/virt-p2v.pod:384
#, no-wrap
msgid ""
" p2v.network=em1:rhevm\n"
@@ -52986,12 +52991,12 @@ msgstr ""
"\n"
#. type: textblock
-#: ../p2v/virt-p2v.pod:383
+#: ../p2v/virt-p2v.pod:386
msgid "maps interface C<em1> to target network C<rhevm>."
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:385
+#: ../p2v/virt-p2v.pod:388
#, no-wrap
msgid ""
" p2v.network=em1:rhevm,em2:management,other\n"
@@ -53001,136 +53006,136 @@ msgstr ""
"\n"
#. type: textblock
-#: ../p2v/virt-p2v.pod:387
+#: ../p2v/virt-p2v.pod:390
msgid ""
"maps interface C<em1> to C<rhevm>, and C<em2> to C<management>, and any "
"other interface that is found to C<other>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:390
+#: ../p2v/virt-p2v.pod:393
msgid "B<p2v.o=[libvirt|local|...]>"
msgstr "B<p2v.o=[libvirt|local|...]>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:392
+#: ../p2v/virt-p2v.pod:395
msgid ""
"Set the output mode. This is the same as the virt-v2v I<-o> option. See "
"L<virt-v2v(1)/OPTIONS>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:395
+#: ../p2v/virt-p2v.pod:398
msgid ""
"If not specified, the default is C<local>, and the converted guest is "
"written to C</var/tmp>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:398
+#: ../p2v/virt-p2v.pod:401
msgid "B<p2v.oa=sparse|preallocated>"
msgstr "B<p2v.oa=sparse|preallocated>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:400
+#: ../p2v/virt-p2v.pod:403
msgid ""
"Set the output allocation mode. This is the same as the virt-v2v I<-oa> "
"option. See L<virt-v2v(1)/OPTIONS>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:403
+#: ../p2v/virt-p2v.pod:406
msgid "B<p2v.oc=...>"
msgstr "B<p2v.oc=...>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:405
+#: ../p2v/virt-p2v.pod:408
msgid ""
"Set the output connection libvirt URI. This is the same as the virt-v2v I<-"
"oc> option. See L<virt-v2v(1)/OPTIONS> and L<http://libvirt.org/uri.html>"
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:409
+#: ../p2v/virt-p2v.pod:412
msgid "B<p2v.of=raw|qcow2|...>"
msgstr "B<p2v.of=raw|qcow2|...>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:411
+#: ../p2v/virt-p2v.pod:414
msgid ""
"Set the output format. This is the same as the virt-v2v I<-of> option. See "
"L<virt-v2v(1)/OPTIONS>."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:414
+#: ../p2v/virt-p2v.pod:417
msgid "B<p2v.os=...>"
msgstr "B<p2v.os=...>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:416
+#: ../p2v/virt-p2v.pod:419
msgid ""
"Set the output storage. This is the same as the virt-v2v I<-os> option. "
"See L<virt-v2v(1)/OPTIONS>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:419
+#: ../p2v/virt-p2v.pod:422
msgid ""
"If not specified, the default is C</var/tmp> (on the conversion server)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:421
+#: ../p2v/virt-p2v.pod:424
msgid "B<ip=dhcp>"
msgstr "B<ip=dhcp>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:423
+#: ../p2v/virt-p2v.pod:426
msgid "Use DHCP for configuring the network interface (this is the default)."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:427
+#: ../p2v/virt-p2v.pod:430
msgid "B<ip=ADDR:GATEWAY:NETMASK>"
msgstr "B<ip=АДРЕСА:ШЛЮЗ:МАСКА_МЕРЕЖІ>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:429
+#: ../p2v/virt-p2v.pod:432
msgid "Set up a static IPv4 network configuration."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:443
+#: ../p2v/virt-p2v.pod:446
msgid "B<--cmdline=CMDLINE>"
msgstr "B<--cmdline=РЯДОК_КОМАНДИ>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:445
+#: ../p2v/virt-p2v.pod:448
msgid ""
"This is used for debugging. Instead of parsing the kernel command line from "
"C</proc/cmdline>, parse the string parameter C<CMDLINE>."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:452
+#: ../p2v/virt-p2v.pod:455
msgid "Enable debugging (on the conversion server)."
msgstr ""
#. type: =head1
-#: ../p2v/virt-p2v.pod:462
+#: ../p2v/virt-p2v.pod:465
msgid "HOW VIRT-P2V WORKS"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:464
+#: ../p2v/virt-p2v.pod:467
msgid ""
"B<Note this section is not normative.> We may change how virt-p2v works at "
"any time in the future."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:467
+#: ../p2v/virt-p2v.pod:470
msgid ""
"As described above, virt-p2v runs on a physical machine, interrogates the "
"user or the kernel command line for configuration, and then establishes one "
@@ -53142,7 +53147,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:475
+#: ../p2v/virt-p2v.pod:478
msgid ""
"It will first make one or more test connections, which are used to query the "
"remote version of virt-v2v and its features. The test connections are "
@@ -53150,7 +53155,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:479
+#: ../p2v/virt-p2v.pod:482
#, no-wrap
msgid ""
" ┌──────────────┐ ┌─────────────────┐\n"
@@ -53162,7 +53167,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:485
+#: ../p2v/virt-p2v.pod:488
msgid ""
"Once virt-p2v is ready to start conversion, it will open a single ssh "
"control connection. It first sends a mkdir command to create a temporary "
@@ -53171,7 +53176,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:490
+#: ../p2v/virt-p2v.pod:493
#, no-wrap
msgid ""
" /tmp/virt-p2v-YYYYMMDD-XXXXXXXX\n"
@@ -53179,40 +53184,40 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:492
+#: ../p2v/virt-p2v.pod:495
msgid ""
"where C<YYYYMMDD> is the current date, and the X's are random characters."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:495
+#: ../p2v/virt-p2v.pod:498
msgid "Into this directory are written various files which include:"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:501 ../p2v/virt-p2v.pod:507 ../p2v/virt-p2v.pod:526
+#: ../p2v/virt-p2v.pod:504 ../p2v/virt-p2v.pod:510 ../p2v/virt-p2v.pod:529
msgid "I<before conversion>"
msgstr "I<до перетворення>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:503
+#: ../p2v/virt-p2v.pod:506
msgid "The name (usually the hostname) of the physical machine."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:505
+#: ../p2v/virt-p2v.pod:508
msgid "C<physical.xml>"
msgstr "C<physical.xml>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:509
+#: ../p2v/virt-p2v.pod:512
msgid ""
"Libvirt XML describing the physical machine. It is used to pass data about "
"the physical source host to L<virt-v2v(1)> via the I<-i libvirtxml> option."
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:513
+#: ../p2v/virt-p2v.pod:516
msgid ""
"Note this is not \"real\" libvirt XML (and must B<never> be loaded into "
"libvirt, which would reject it anyhow). Also it is not the same as the "
@@ -53220,44 +53225,44 @@ msgid ""
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:517
+#: ../p2v/virt-p2v.pod:520
msgid "C<status>"
msgstr "C<status>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:519
+#: ../p2v/virt-p2v.pod:522
msgid "I<after conversion>"
msgstr "I<після перетворення>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:521
+#: ../p2v/virt-p2v.pod:524
msgid ""
"The final status of the conversion. C<0> if the conversion was successful. "
"Non-zero if the conversion failed."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:524
+#: ../p2v/virt-p2v.pod:527
msgid "C<time>"
msgstr "C<time>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:528
+#: ../p2v/virt-p2v.pod:531
msgid "The start date/time of conversion."
msgstr ""
#. type: =item
-#: ../p2v/virt-p2v.pod:530
+#: ../p2v/virt-p2v.pod:533
msgid "C<virt-v2v-conversion-log.txt>"
msgstr "C<virt-v2v-conversion-log.txt>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:532
+#: ../p2v/virt-p2v.pod:535
msgid "I<during/after conversion>"
msgstr "I<підчас/після перетворення>"
#. type: textblock
-#: ../p2v/virt-p2v.pod:534
+#: ../p2v/virt-p2v.pod:537
msgid ""
"The conversion log. This is just the output of the virt-v2v command on the "
"conversion server. If conversion fails, you should examine this log file, "
@@ -53266,7 +53271,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:541
+#: ../p2v/virt-p2v.pod:544
msgid ""
"Before conversion actually begins, virt-p2v then makes one or more further "
"ssh connections to the server for data transfer. The transfer protocol used "
@@ -53277,7 +53282,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../p2v/virt-p2v.pod:548
+#: ../p2v/virt-p2v.pod:551
#, no-wrap
msgid ""
" ┌──────────────┐ ┌─────────────────┐\n"
@@ -53295,7 +53300,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:560
+#: ../p2v/virt-p2v.pod:563
msgid ""
"Although the ssh data connection is originated from the physical server and "
"terminates on the conversion server, in fact NBD requests flow in the "
@@ -53308,7 +53313,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:569
+#: ../p2v/virt-p2v.pod:572
msgid ""
"Two layers of protection are used to ensure that there are no writes to the "
"hard disks: Firstly, the qemu-nbd I<-r> (readonly) option is used. Secondly "
@@ -53317,7 +53322,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:575
+#: ../p2v/virt-p2v.pod:578
msgid ""
"The final step is to send the S<C<virt-v2v -i libvirtxml physical.xml ...>> "
"command to the conversion server over the control connection. This "
@@ -53326,7 +53331,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:580
+#: ../p2v/virt-p2v.pod:583
msgid ""
"Output from the virt-v2v command (messages, debugging etc) is saved both in "
"the log file on the conversion server, and sent over the control connection "
@@ -53334,7 +53339,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:586
+#: ../p2v/virt-p2v.pod:589
#, fuzzy
#| msgid ""
#| "L<virt-p2v(1)>, L<virt-p2v-make-kickstart(1)>, L<virt-v2v(1)>, L<http://"
@@ -53348,27 +53353,27 @@ msgstr ""
"libguestfs.org/>."
#. type: textblock
-#: ../p2v/virt-p2v.pod:597 ../v2v/virt-v2v.pod:1525
+#: ../p2v/virt-p2v.pod:600 ../v2v/virt-v2v.pod:1525
msgid "Matthew Booth"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:599
+#: ../p2v/virt-p2v.pod:602
msgid "John Eckersberg"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:603 ../v2v/virt-v2v.pod:1527
+#: ../p2v/virt-p2v.pod:606 ../v2v/virt-v2v.pod:1527
msgid "Mike Latimer"
msgstr "Mike Latimer"
#. type: textblock
-#: ../p2v/virt-p2v.pod:605
+#: ../p2v/virt-p2v.pod:608
msgid "Pino Toscano"
msgstr ""
#. type: textblock
-#: ../p2v/virt-p2v.pod:607 ../v2v/virt-v2v.pod:1531
+#: ../p2v/virt-p2v.pod:610 ../v2v/virt-v2v.pod:1531
msgid "Tingting Zheng"
msgstr "Tingting Zheng"
@@ -92448,19 +92453,29 @@ msgstr "Shahar Havivi"
#~ msgid ""
#~ " $ annotate-output +'%T.%N' guestfish -a /dev/null run -v\n"
#~ " 22:17:53.215784625 I: Started guestfish -a /dev/null run -v\n"
-#~ " 22:17:53.240335409 E: libguestfs: [00000ms] supermin-helper --verbose -f checksum '/usr/lib64/guestfs/supermin.d' x86_64\n"
-#~ " 22:17:53.266857866 E: supermin helper [00000ms] whitelist = (not specified), host_cpu = x86_64, kernel = (null), initrd = (null), appliance = (null)\n"
-#~ " 22:17:53.272704072 E: supermin helper [00000ms] inputs[0] = /usr/lib64/guestfs/supermin.d\n"
-#~ " 22:17:53.276528651 E: checking modpath /lib/modules/3.4.0-1.fc17.x86_64.debug is a directory\n"
+#~ " 22:17:53.240335409 E: libguestfs: [00000ms] supermin-helper --verbose -f "
+#~ "checksum '/usr/lib64/guestfs/supermin.d' x86_64\n"
+#~ " 22:17:53.266857866 E: supermin helper [00000ms] whitelist = (not "
+#~ "specified), host_cpu = x86_64, kernel = (null), initrd = (null), "
+#~ "appliance = (null)\n"
+#~ " 22:17:53.272704072 E: supermin helper [00000ms] inputs[0] = /usr/lib64/"
+#~ "guestfs/supermin.d\n"
+#~ " 22:17:53.276528651 E: checking modpath /lib/modules/3.4.0-1.fc17.x86_64."
+#~ "debug is a directory\n"
#~ " [etc]\n"
#~ "\n"
#~ msgstr ""
#~ " $ annotate-output +'%T.%N' guestfish -a /dev/null run -v\n"
#~ " 22:17:53.215784625 I: Started guestfish -a /dev/null run -v\n"
-#~ " 22:17:53.240335409 E: libguestfs: [00000ms] supermin-helper --verbose -f checksum '/usr/lib64/guestfs/supermin.d' x86_64\n"
-#~ " 22:17:53.266857866 E: supermin helper [00000ms] whitelist = (not specified), host_cpu = x86_64, kernel = (null), initrd = (null), appliance = (null)\n"
-#~ " 22:17:53.272704072 E: supermin helper [00000ms] inputs[0] = /usr/lib64/guestfs/supermin.d\n"
-#~ " 22:17:53.276528651 E: checking modpath /lib/modules/3.4.0-1.fc17.x86_64.debug is a directory\n"
+#~ " 22:17:53.240335409 E: libguestfs: [00000ms] supermin-helper --verbose -f "
+#~ "checksum '/usr/lib64/guestfs/supermin.d' x86_64\n"
+#~ " 22:17:53.266857866 E: supermin helper [00000ms] whitelist = (not "
+#~ "specified), host_cpu = x86_64, kernel = (null), initrd = (null), "
+#~ "appliance = (null)\n"
+#~ " 22:17:53.272704072 E: supermin helper [00000ms] inputs[0] = /usr/lib64/"
+#~ "guestfs/supermin.d\n"
+#~ " 22:17:53.276528651 E: checking modpath /lib/modules/3.4.0-1.fc17.x86_64."
+#~ "debug is a directory\n"
#~ " [etc]\n"
#~ "\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 3c6e690..bfaacb8 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-04-26 15:58+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+0100\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1350
+#: ../v2v/convert_linux.ml:1352
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -235,10 +235,6 @@ msgid ""
"read the man page virt-customize(1).\n"
msgstr ""
-#: ../resize/resize.ml:158
-msgid "%s: empty --expand option"
-msgstr ""
-
#: ../mllib/common_utils.ml:251
msgid "%s: error: %s"
msgstr ""
@@ -400,7 +396,7 @@ msgstr ""
msgid "%s: zero length path in the index file\n"
msgstr ""
-#: ../customize/firstboot.ml:189
+#: ../customize/firstboot.ml:193
msgid ""
"'%s' is missing. This file is required in order to install Windows "
"firstboot scripts. You can get it by building rhsrvany (https://github.com/"
@@ -1868,7 +1864,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1144
+#: ../v2v/convert_linux.ml:1146
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -2067,13 +2063,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:634
+#: ../v2v/convert_linux.ml:636
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:543
+#: ../v2v/convert_linux.ml:545
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2218,7 +2214,7 @@ msgstr ""
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1074
+#: ../v2v/convert_linux.ml:1076
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2268,7 +2264,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1092
+#: ../v2v/convert_linux.ml:1094
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2279,7 +2275,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1076
+#: ../v2v/convert_linux.ml:1078
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2311,7 +2307,7 @@ msgid ""
"This could be a bug in %s."
msgstr ""
-#: ../v2v/convert_linux.ml:794
+#: ../v2v/convert_linux.ml:796
msgid "didn't find grub entry for kernel %s"
msgstr ""
@@ -2367,7 +2363,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1199
+#: ../v2v/convert_linux.ml:1201
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2375,6 +2371,10 @@ msgstr ""
msgid "duplicate operation name (%s)"
msgstr ""
+#: ../resize/resize.ml:158
+msgid "empty --expand option"
+msgstr ""
+
#: ../resize/resize.ml:175
msgid "empty --shrink option"
msgstr ""
@@ -2516,11 +2516,11 @@ msgstr ""
msgid "gpg program is not available"
msgstr ""
-#: ../customize/firstboot.ml:129
+#: ../customize/firstboot.ml:133
msgid "guest type %s is not supported"
msgstr ""
-#: ../customize/firstboot.ml:315
+#: ../customize/firstboot.ml:319
msgid "guest type %s/%s is not supported"
msgstr ""
@@ -2574,7 +2574,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/convert_linux.ml:798
+#: ../v2v/convert_linux.ml:800
msgid "internal error: regular expression did not match '%s'"
msgstr ""
@@ -2594,7 +2594,7 @@ msgstr ""
msgid "invalid password selector '%s'; see the man page"
msgstr ""
-#: ../v2v/convert_linux.ml:782
+#: ../v2v/convert_linux.ml:784
msgid "kernel %s is not under grub tree %s"
msgstr ""
@@ -2679,7 +2679,7 @@ msgstr ""
msgid "no kernel found"
msgstr ""
-#: ../v2v/convert_linux.ml:395
+#: ../v2v/convert_linux.ml:397
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2722,7 +2722,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:749
+#: ../v2v/convert_linux.ml:751
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2984,7 +2984,7 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1243
+#: ../v2v/convert_linux.ml:1245
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
@@ -2999,7 +2999,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:941
+#: ../v2v/convert_linux.ml:943
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3293,11 +3293,11 @@ msgstr ""
msgid "%s: --uuid option cannot be used with -a or -d\n"
msgstr ""
-#: align/scan.c:330
+#: align/scan.c:336
msgid "alignment < 4K"
msgstr ""
-#: align/scan.c:333
+#: align/scan.c:339
msgid "alignment < 64K"
msgstr ""
@@ -3744,8 +3744,8 @@ msgstr "use 'sparse file size' to create a sparse image\n"
#: fish/alloc.c:100
#, c-format
-msgid "%s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: invalid integer parameter (%s returned %d)\n"
+msgid "%s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:3800
msgid "Command"
@@ -6123,7 +6123,7 @@ msgstr ""
#: fish/cmds.c:24085 fish/cmds.c:24102 fish/cmds.c:24253 fish/cmds.c:24270
#: fish/cmds.c:24287 fish/cmds.c:24304
#, c-format
-msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
+msgid "%s: %s: invalid integer parameter (%s returned %u)\n"
msgstr ""
#: fish/cmds.c:5550 fish/cmds.c:5770 fish/cmds.c:5896 fish/cmds.c:6001
@@ -7150,7 +7150,7 @@ msgstr ""
#: make-fs/make-fs.c:619
#, c-format
-msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
+msgid "%s: %s: invalid size parameter '%s' (%s returned %u)\n"
msgstr ""
#: make-fs/make-fs.c:819
@@ -7549,7 +7549,7 @@ msgstr ""
#: src/appliance.c:247
#, c-format
-msgid "security: cached appliance %s is not owned by UID %d"
+msgid "security: cached appliance %s is not owned by UID %ju"
msgstr ""
#: src/appliance.c:252
@@ -8048,38 +8048,38 @@ msgstr ""
msgid "setting not found"
msgstr ""
-#: src/info.c:144
+#: src/info.c:152
msgid "qemu-img info: JSON output did not contain 'format' key"
msgstr ""
-#: src/info.c:175
+#: src/info.c:183
msgid "qemu-img info: 'virtual-size' is not representable as a 64 bit integer"
msgstr ""
-#: src/info.c:183
+#: src/info.c:191
msgid "qemu-img info: JSON output did not contain 'virtual-size' key"
msgstr ""
-#: src/info.c:221
+#: src/info.c:229
msgid "qemu-img info: JSON output was not an object"
msgstr ""
-#: src/info.c:287
+#: src/info.c:301
msgid ""
"qemu-img info command produced no output, but didn't return an error status "
"code"
msgstr ""
-#: src/info.c:321
+#: src/info.c:335
#, c-format
msgid "qemu-img info: JSON parse error: %s"
msgstr ""
-#: src/info.c:323
+#: src/info.c:337
msgid "qemu-img info: unknown JSON parse error"
msgstr ""
-#: src/info.c:461
+#: src/info.c:475
#, c-format
msgid "%s: cannot detect virtual size of disk image"
msgstr ""
@@ -8101,7 +8101,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:646
+#: src/inspect-icon.c:643
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
@@ -8152,7 +8152,7 @@ msgstr ""
msgid "qemu launched and contacted daemon, but state != READY"
msgstr ""
-#: src/launch-direct.c:1285 src/launch-libvirt.c:1402
+#: src/launch-direct.c:1285 src/launch-libvirt.c:1403
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
@@ -8249,70 +8249,70 @@ msgid ""
"For further help, read the guestfs(3) man page and libguestfs FAQ."
msgstr ""
-#: src/launch-libvirt.c:966
+#: src/launch-libvirt.c:967
#, c-format
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1356
+#: src/launch-libvirt.c:1357
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1485
+#: src/launch-libvirt.c:1486
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1510
+#: src/launch-libvirt.c:1511
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1517
+#: src/launch-libvirt.c:1518
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1847
+#: src/launch-libvirt.c:1848
msgid "could not define libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:1858
+#: src/launch-libvirt.c:1859
msgid "rbd protocol secret must be base64 encoded"
msgstr ""
-#: src/launch-libvirt.c:1862
+#: src/launch-libvirt.c:1863
#, c-format
msgid "base64_decode_alloc: %m"
msgstr ""
-#: src/launch-libvirt.c:1883
+#: src/launch-libvirt.c:1884
msgid "could not set libvirt secret value"
msgstr ""
-#: src/launch-libvirt.c:1896
+#: src/launch-libvirt.c:1897
msgid "could not get UUID from libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:2003
+#: src/launch-libvirt.c:2004
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2054 src/launch-libvirt.c:2087
+#: src/launch-libvirt.c:2055 src/launch-libvirt.c:2088
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:2150
+#: src/launch-libvirt.c:2151
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2181
+#: src/launch-libvirt.c:2182
msgid "could not detach disk from libvirt domain"
msgstr ""
@@ -8661,7 +8661,7 @@ msgstr ""
#: test-tool/test-tool.c:154
#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+msgid "libguestfs-test-tool: unexpected command line option %d\n"
msgstr ""
#: test-tool/test-tool.c:161
@@ -8842,3 +8842,6 @@ msgstr ""
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr ""
+
+#~ msgid "%s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: invalid integer parameter (%s returned %d)\n"
diff --git a/po/es.po b/po/es.po
index e22f7a8..1513291 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-04-26 15:58+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+0100\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/libguestfs/"
@@ -75,7 +75,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1350
+#: ../v2v/convert_linux.ml:1352
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -237,10 +237,6 @@ msgid ""
"read the man page virt-customize(1).\n"
msgstr ""
-#: ../resize/resize.ml:158
-msgid "%s: empty --expand option"
-msgstr ""
-
#: ../mllib/common_utils.ml:251
msgid "%s: error: %s"
msgstr ""
@@ -402,7 +398,7 @@ msgstr ""
msgid "%s: zero length path in the index file\n"
msgstr ""
-#: ../customize/firstboot.ml:189
+#: ../customize/firstboot.ml:193
msgid ""
"'%s' is missing. This file is required in order to install Windows "
"firstboot scripts. You can get it by building rhsrvany (https://github.com/"
@@ -1870,7 +1866,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1144
+#: ../v2v/convert_linux.ml:1146
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -2069,13 +2065,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:634
+#: ../v2v/convert_linux.ml:636
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:543
+#: ../v2v/convert_linux.ml:545
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2220,7 +2216,7 @@ msgstr ""
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1074
+#: ../v2v/convert_linux.ml:1076
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2270,7 +2266,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1092
+#: ../v2v/convert_linux.ml:1094
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2281,7 +2277,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1076
+#: ../v2v/convert_linux.ml:1078
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2313,7 +2309,7 @@ msgid ""
"This could be a bug in %s."
msgstr ""
-#: ../v2v/convert_linux.ml:794
+#: ../v2v/convert_linux.ml:796
msgid "didn't find grub entry for kernel %s"
msgstr ""
@@ -2369,7 +2365,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1199
+#: ../v2v/convert_linux.ml:1201
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2377,6 +2373,10 @@ msgstr ""
msgid "duplicate operation name (%s)"
msgstr ""
+#: ../resize/resize.ml:158
+msgid "empty --expand option"
+msgstr ""
+
#: ../resize/resize.ml:175
msgid "empty --shrink option"
msgstr ""
@@ -2518,11 +2518,11 @@ msgstr ""
msgid "gpg program is not available"
msgstr ""
-#: ../customize/firstboot.ml:129
+#: ../customize/firstboot.ml:133
msgid "guest type %s is not supported"
msgstr ""
-#: ../customize/firstboot.ml:315
+#: ../customize/firstboot.ml:319
msgid "guest type %s/%s is not supported"
msgstr ""
@@ -2576,7 +2576,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/convert_linux.ml:798
+#: ../v2v/convert_linux.ml:800
msgid "internal error: regular expression did not match '%s'"
msgstr ""
@@ -2596,7 +2596,7 @@ msgstr ""
msgid "invalid password selector '%s'; see the man page"
msgstr ""
-#: ../v2v/convert_linux.ml:782
+#: ../v2v/convert_linux.ml:784
msgid "kernel %s is not under grub tree %s"
msgstr ""
@@ -2681,7 +2681,7 @@ msgstr ""
msgid "no kernel found"
msgstr ""
-#: ../v2v/convert_linux.ml:395
+#: ../v2v/convert_linux.ml:397
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2724,7 +2724,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:749
+#: ../v2v/convert_linux.ml:751
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2986,7 +2986,7 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1243
+#: ../v2v/convert_linux.ml:1245
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
@@ -3001,7 +3001,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:941
+#: ../v2v/convert_linux.ml:943
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3295,11 +3295,11 @@ msgstr ""
msgid "%s: --uuid option cannot be used with -a or -d\n"
msgstr ""
-#: align/scan.c:330
+#: align/scan.c:336
msgid "alignment < 4K"
msgstr "alineamiento <4K"
-#: align/scan.c:333
+#: align/scan.c:339
msgid "alignment < 64K"
msgstr "alineamiento <64K"
@@ -3752,8 +3752,8 @@ msgstr "Utilice el comando 'sparse file size' para generar una imagen sparse\n"
#: fish/alloc.c:100
#, c-format
-msgid "%s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: parámetro entero no válido (%s devolvió %d)\n"
+msgid "%s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:3800
msgid "Command"
@@ -6169,8 +6169,8 @@ msgstr "%s: el argumento optativo \"%s\" ha sido ofrecido dos veces\n"
#: fish/cmds.c:24085 fish/cmds.c:24102 fish/cmds.c:24253 fish/cmds.c:24270
#: fish/cmds.c:24287 fish/cmds.c:24304
#, c-format
-msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: %s: parámetro entero no válido (%s devolvió %d)\n"
+msgid "%s: %s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:5550 fish/cmds.c:5770 fish/cmds.c:5896 fish/cmds.c:6001
#: fish/cmds.c:6898 fish/cmds.c:8359 fish/cmds.c:8457 fish/cmds.c:8478
@@ -7271,7 +7271,7 @@ msgstr ""
#: make-fs/make-fs.c:619
#, c-format
-msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
+msgid "%s: %s: invalid size parameter '%s' (%s returned %u)\n"
msgstr ""
#: make-fs/make-fs.c:819
@@ -7670,8 +7670,8 @@ msgstr ""
#: src/appliance.c:247
#, c-format
-msgid "security: cached appliance %s is not owned by UID %d"
-msgstr "seguridad: el dispositivo cacheado %s no es propiedad del UID %d"
+msgid "security: cached appliance %s is not owned by UID %ju"
+msgstr ""
#: src/appliance.c:252
#, c-format
@@ -8173,38 +8173,38 @@ msgstr ""
msgid "setting not found"
msgstr ""
-#: src/info.c:144
+#: src/info.c:152
msgid "qemu-img info: JSON output did not contain 'format' key"
msgstr ""
-#: src/info.c:175
+#: src/info.c:183
msgid "qemu-img info: 'virtual-size' is not representable as a 64 bit integer"
msgstr ""
-#: src/info.c:183
+#: src/info.c:191
msgid "qemu-img info: JSON output did not contain 'virtual-size' key"
msgstr ""
-#: src/info.c:221
+#: src/info.c:229
msgid "qemu-img info: JSON output was not an object"
msgstr ""
-#: src/info.c:287
+#: src/info.c:301
msgid ""
"qemu-img info command produced no output, but didn't return an error status "
"code"
msgstr ""
-#: src/info.c:321
+#: src/info.c:335
#, c-format
msgid "qemu-img info: JSON parse error: %s"
msgstr ""
-#: src/info.c:323
+#: src/info.c:337
msgid "qemu-img info: unknown JSON parse error"
msgstr ""
-#: src/info.c:461
+#: src/info.c:475
#, c-format
msgid "%s: cannot detect virtual size of disk image"
msgstr ""
@@ -8226,7 +8226,7 @@ msgstr "el tamaño de %s es irracionalmente largo (%<PRIi64> bytes)"
msgid "could not parse integer in version number: %s"
msgstr "no se pudo analizar el entero en el número de la versión: %s"
-#: src/inspect-icon.c:646
+#: src/inspect-icon.c:643
#, c-format
msgid "read: %s: unexpected end of file"
msgstr "read: %s: fin de archivo no esperado"
@@ -8280,7 +8280,7 @@ msgid "qemu launched and contacted daemon, but state != READY"
msgstr ""
"qemu ha sido iniciado y contactado el demonio, pero es estado es != READY"
-#: src/launch-direct.c:1285 src/launch-libvirt.c:1402
+#: src/launch-direct.c:1285 src/launch-libvirt.c:1403
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
@@ -8377,70 +8377,70 @@ msgid ""
"For further help, read the guestfs(3) man page and libguestfs FAQ."
msgstr ""
-#: src/launch-libvirt.c:966
+#: src/launch-libvirt.c:967
#, c-format
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1356
+#: src/launch-libvirt.c:1357
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1485
+#: src/launch-libvirt.c:1486
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1510
+#: src/launch-libvirt.c:1511
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1517
+#: src/launch-libvirt.c:1518
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1847
+#: src/launch-libvirt.c:1848
msgid "could not define libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:1858
+#: src/launch-libvirt.c:1859
msgid "rbd protocol secret must be base64 encoded"
msgstr ""
-#: src/launch-libvirt.c:1862
+#: src/launch-libvirt.c:1863
#, c-format
msgid "base64_decode_alloc: %m"
msgstr ""
-#: src/launch-libvirt.c:1883
+#: src/launch-libvirt.c:1884
msgid "could not set libvirt secret value"
msgstr ""
-#: src/launch-libvirt.c:1896
+#: src/launch-libvirt.c:1897
msgid "could not get UUID from libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:2003
+#: src/launch-libvirt.c:2004
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2054 src/launch-libvirt.c:2087
+#: src/launch-libvirt.c:2055 src/launch-libvirt.c:2088
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:2150
+#: src/launch-libvirt.c:2151
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2181
+#: src/launch-libvirt.c:2182
msgid "could not detach disk from libvirt domain"
msgstr ""
@@ -8807,8 +8807,8 @@ msgstr "libguestfs-test-tool: falló guestfs_version\n"
#: test-tool/test-tool.c:154
#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
-msgstr "libguestfs-test-tool: opción de línea de comando no esperada 0x%x\n"
+msgid "libguestfs-test-tool: unexpected command line option %d\n"
+msgstr ""
#: test-tool/test-tool.c:161
#, c-format
@@ -9010,3 +9010,15 @@ msgstr ""
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr ""
"virt-win-reg: {p}: no ha sido posible cargar el archivo de registro: {err}\n"
+
+#~ msgid "%s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: parámetro entero no válido (%s devolvió %d)\n"
+
+#~ msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: %s: parámetro entero no válido (%s devolvió %d)\n"
+
+#~ msgid "security: cached appliance %s is not owned by UID %d"
+#~ msgstr "seguridad: el dispositivo cacheado %s no es propiedad del UID %d"
+
+#~ msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+#~ msgstr "libguestfs-test-tool: opción de línea de comando no esperada 0x%x\n"
diff --git a/po/gu.po b/po/gu.po
index c7aeab0..3d7463f 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-04-26 15:58+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+0100\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Gujarati (http://www.transifex.com/projects/p/libguestfs/"
@@ -74,7 +74,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1350
+#: ../v2v/convert_linux.ml:1352
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -236,10 +236,6 @@ msgid ""
"read the man page virt-customize(1).\n"
msgstr ""
-#: ../resize/resize.ml:158
-msgid "%s: empty --expand option"
-msgstr ""
-
#: ../mllib/common_utils.ml:251
msgid "%s: error: %s"
msgstr ""
@@ -401,7 +397,7 @@ msgstr ""
msgid "%s: zero length path in the index file\n"
msgstr ""
-#: ../customize/firstboot.ml:189
+#: ../customize/firstboot.ml:193
msgid ""
"'%s' is missing. This file is required in order to install Windows "
"firstboot scripts. You can get it by building rhsrvany (https://github.com/"
@@ -1869,7 +1865,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1144
+#: ../v2v/convert_linux.ml:1146
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -2068,13 +2064,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:634
+#: ../v2v/convert_linux.ml:636
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:543
+#: ../v2v/convert_linux.ml:545
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2219,7 +2215,7 @@ msgstr ""
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1074
+#: ../v2v/convert_linux.ml:1076
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2269,7 +2265,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1092
+#: ../v2v/convert_linux.ml:1094
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2280,7 +2276,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1076
+#: ../v2v/convert_linux.ml:1078
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2312,7 +2308,7 @@ msgid ""
"This could be a bug in %s."
msgstr ""
-#: ../v2v/convert_linux.ml:794
+#: ../v2v/convert_linux.ml:796
msgid "didn't find grub entry for kernel %s"
msgstr ""
@@ -2368,7 +2364,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1199
+#: ../v2v/convert_linux.ml:1201
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2376,6 +2372,10 @@ msgstr ""
msgid "duplicate operation name (%s)"
msgstr ""
+#: ../resize/resize.ml:158
+msgid "empty --expand option"
+msgstr ""
+
#: ../resize/resize.ml:175
msgid "empty --shrink option"
msgstr ""
@@ -2517,11 +2517,11 @@ msgstr ""
msgid "gpg program is not available"
msgstr ""
-#: ../customize/firstboot.ml:129
+#: ../customize/firstboot.ml:133
msgid "guest type %s is not supported"
msgstr ""
-#: ../customize/firstboot.ml:315
+#: ../customize/firstboot.ml:319
msgid "guest type %s/%s is not supported"
msgstr ""
@@ -2575,7 +2575,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/convert_linux.ml:798
+#: ../v2v/convert_linux.ml:800
msgid "internal error: regular expression did not match '%s'"
msgstr ""
@@ -2595,7 +2595,7 @@ msgstr ""
msgid "invalid password selector '%s'; see the man page"
msgstr ""
-#: ../v2v/convert_linux.ml:782
+#: ../v2v/convert_linux.ml:784
msgid "kernel %s is not under grub tree %s"
msgstr ""
@@ -2680,7 +2680,7 @@ msgstr ""
msgid "no kernel found"
msgstr ""
-#: ../v2v/convert_linux.ml:395
+#: ../v2v/convert_linux.ml:397
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2723,7 +2723,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:749
+#: ../v2v/convert_linux.ml:751
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2985,7 +2985,7 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1243
+#: ../v2v/convert_linux.ml:1245
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
@@ -3000,7 +3000,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:941
+#: ../v2v/convert_linux.ml:943
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3294,11 +3294,11 @@ msgstr ""
msgid "%s: --uuid option cannot be used with -a or -d\n"
msgstr ""
-#: align/scan.c:330
+#: align/scan.c:336
msgid "alignment < 4K"
msgstr ""
-#: align/scan.c:333
+#: align/scan.c:339
msgid "alignment < 64K"
msgstr ""
@@ -3711,7 +3711,7 @@ msgstr "છૂટુંછવાયી ઇમેજને બનાવવા મ
#: fish/alloc.c:100
#, c-format
-msgid "%s: invalid integer parameter (%s returned %d)\n"
+msgid "%s: invalid integer parameter (%s returned %u)\n"
msgstr ""
#: fish/cmds.c:3800
@@ -6090,8 +6090,8 @@ msgstr ""
#: fish/cmds.c:24085 fish/cmds.c:24102 fish/cmds.c:24253 fish/cmds.c:24270
#: fish/cmds.c:24287 fish/cmds.c:24304
#, c-format
-msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: %s: અયોગ્ય ઇંટિજર પરિમાણ (%s એ %d ને પાછુ લાવેલ છે)\n"
+msgid "%s: %s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:5550 fish/cmds.c:5770 fish/cmds.c:5896 fish/cmds.c:6001
#: fish/cmds.c:6898 fish/cmds.c:8359 fish/cmds.c:8457 fish/cmds.c:8478
@@ -7127,7 +7127,7 @@ msgstr ""
#: make-fs/make-fs.c:619
#, c-format
-msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
+msgid "%s: %s: invalid size parameter '%s' (%s returned %u)\n"
msgstr ""
#: make-fs/make-fs.c:819
@@ -7526,7 +7526,7 @@ msgstr ""
#: src/appliance.c:247
#, c-format
-msgid "security: cached appliance %s is not owned by UID %d"
+msgid "security: cached appliance %s is not owned by UID %ju"
msgstr ""
#: src/appliance.c:252
@@ -8025,38 +8025,38 @@ msgstr ""
msgid "setting not found"
msgstr ""
-#: src/info.c:144
+#: src/info.c:152
msgid "qemu-img info: JSON output did not contain 'format' key"
msgstr ""
-#: src/info.c:175
+#: src/info.c:183
msgid "qemu-img info: 'virtual-size' is not representable as a 64 bit integer"
msgstr ""
-#: src/info.c:183
+#: src/info.c:191
msgid "qemu-img info: JSON output did not contain 'virtual-size' key"
msgstr ""
-#: src/info.c:221
+#: src/info.c:229
msgid "qemu-img info: JSON output was not an object"
msgstr ""
-#: src/info.c:287
+#: src/info.c:301
msgid ""
"qemu-img info command produced no output, but didn't return an error status "
"code"
msgstr ""
-#: src/info.c:321
+#: src/info.c:335
#, c-format
msgid "qemu-img info: JSON parse error: %s"
msgstr ""
-#: src/info.c:323
+#: src/info.c:337
msgid "qemu-img info: unknown JSON parse error"
msgstr ""
-#: src/info.c:461
+#: src/info.c:475
#, c-format
msgid "%s: cannot detect virtual size of disk image"
msgstr ""
@@ -8078,7 +8078,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:646
+#: src/inspect-icon.c:643
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
@@ -8129,7 +8129,7 @@ msgstr "તમારે guestfs_launch પહેલાં guestfs_add_drive ન
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu શરૂ થયેલ છે, ડિમનનો સંપર્ક થયેલ છે, પરંતુ state != READY"
-#: src/launch-direct.c:1285 src/launch-libvirt.c:1402
+#: src/launch-direct.c:1285 src/launch-libvirt.c:1403
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
@@ -8226,70 +8226,70 @@ msgid ""
"For further help, read the guestfs(3) man page and libguestfs FAQ."
msgstr ""
-#: src/launch-libvirt.c:966
+#: src/launch-libvirt.c:967
#, c-format
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1356
+#: src/launch-libvirt.c:1357
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1485
+#: src/launch-libvirt.c:1486
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1510
+#: src/launch-libvirt.c:1511
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1517
+#: src/launch-libvirt.c:1518
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1847
+#: src/launch-libvirt.c:1848
msgid "could not define libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:1858
+#: src/launch-libvirt.c:1859
msgid "rbd protocol secret must be base64 encoded"
msgstr ""
-#: src/launch-libvirt.c:1862
+#: src/launch-libvirt.c:1863
#, c-format
msgid "base64_decode_alloc: %m"
msgstr ""
-#: src/launch-libvirt.c:1883
+#: src/launch-libvirt.c:1884
msgid "could not set libvirt secret value"
msgstr ""
-#: src/launch-libvirt.c:1896
+#: src/launch-libvirt.c:1897
msgid "could not get UUID from libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:2003
+#: src/launch-libvirt.c:2004
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2054 src/launch-libvirt.c:2087
+#: src/launch-libvirt.c:2055 src/launch-libvirt.c:2088
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:2150
+#: src/launch-libvirt.c:2151
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2181
+#: src/launch-libvirt.c:2182
msgid "could not detach disk from libvirt domain"
msgstr ""
@@ -8638,8 +8638,8 @@ msgstr "libguestfs-test-tool: guestfs_version નિષ્ફળ\n"
#: test-tool/test-tool.c:154
#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
-msgstr "libguestfs-test-tool: અનિચ્છનીય આદેશ વાક્ય વિકલ્પ 0x%x\n"
+msgid "libguestfs-test-tool: unexpected command line option %d\n"
+msgstr ""
#: test-tool/test-tool.c:161
#, c-format
@@ -8819,3 +8819,9 @@ msgstr ""
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr ""
+
+#~ msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: %s: અયોગ્ય ઇંટિજર પરિમાણ (%s એ %d ને પાછુ લાવેલ છે)\n"
+
+#~ msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+#~ msgstr "libguestfs-test-tool: અનિચ્છનીય આદેશ વાક્ય વિકલ્પ 0x%x\n"
diff --git a/po/hi.po b/po/hi.po
index 9eaab06..714379f 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-04-26 15:58+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+0100\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/libguestfs/"
@@ -74,7 +74,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1350
+#: ../v2v/convert_linux.ml:1352
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -236,10 +236,6 @@ msgid ""
"read the man page virt-customize(1).\n"
msgstr ""
-#: ../resize/resize.ml:158
-msgid "%s: empty --expand option"
-msgstr ""
-
#: ../mllib/common_utils.ml:251
msgid "%s: error: %s"
msgstr ""
@@ -401,7 +397,7 @@ msgstr ""
msgid "%s: zero length path in the index file\n"
msgstr ""
-#: ../customize/firstboot.ml:189
+#: ../customize/firstboot.ml:193
msgid ""
"'%s' is missing. This file is required in order to install Windows "
"firstboot scripts. You can get it by building rhsrvany (https://github.com/"
@@ -1869,7 +1865,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1144
+#: ../v2v/convert_linux.ml:1146
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -2068,13 +2064,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:634
+#: ../v2v/convert_linux.ml:636
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:543
+#: ../v2v/convert_linux.ml:545
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2219,7 +2215,7 @@ msgstr ""
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1074
+#: ../v2v/convert_linux.ml:1076
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2269,7 +2265,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1092
+#: ../v2v/convert_linux.ml:1094
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2280,7 +2276,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1076
+#: ../v2v/convert_linux.ml:1078
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2312,7 +2308,7 @@ msgid ""
"This could be a bug in %s."
msgstr ""
-#: ../v2v/convert_linux.ml:794
+#: ../v2v/convert_linux.ml:796
msgid "didn't find grub entry for kernel %s"
msgstr ""
@@ -2368,7 +2364,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1199
+#: ../v2v/convert_linux.ml:1201
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2376,6 +2372,10 @@ msgstr ""
msgid "duplicate operation name (%s)"
msgstr ""
+#: ../resize/resize.ml:158
+msgid "empty --expand option"
+msgstr ""
+
#: ../resize/resize.ml:175
msgid "empty --shrink option"
msgstr ""
@@ -2517,11 +2517,11 @@ msgstr ""
msgid "gpg program is not available"
msgstr ""
-#: ../customize/firstboot.ml:129
+#: ../customize/firstboot.ml:133
msgid "guest type %s is not supported"
msgstr ""
-#: ../customize/firstboot.ml:315
+#: ../customize/firstboot.ml:319
msgid "guest type %s/%s is not supported"
msgstr ""
@@ -2575,7 +2575,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/convert_linux.ml:798
+#: ../v2v/convert_linux.ml:800
msgid "internal error: regular expression did not match '%s'"
msgstr ""
@@ -2595,7 +2595,7 @@ msgstr ""
msgid "invalid password selector '%s'; see the man page"
msgstr ""
-#: ../v2v/convert_linux.ml:782
+#: ../v2v/convert_linux.ml:784
msgid "kernel %s is not under grub tree %s"
msgstr ""
@@ -2680,7 +2680,7 @@ msgstr ""
msgid "no kernel found"
msgstr ""
-#: ../v2v/convert_linux.ml:395
+#: ../v2v/convert_linux.ml:397
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2723,7 +2723,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:749
+#: ../v2v/convert_linux.ml:751
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2985,7 +2985,7 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1243
+#: ../v2v/convert_linux.ml:1245
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
@@ -3000,7 +3000,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:941
+#: ../v2v/convert_linux.ml:943
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3294,11 +3294,11 @@ msgstr ""
msgid "%s: --uuid option cannot be used with -a or -d\n"
msgstr ""
-#: align/scan.c:330
+#: align/scan.c:336
msgid "alignment < 4K"
msgstr ""
-#: align/scan.c:333
+#: align/scan.c:339
msgid "alignment < 64K"
msgstr ""
@@ -3711,7 +3711,7 @@ msgstr "छवि कम घना करने के लिए 'sparse file si
#: fish/alloc.c:100
#, c-format
-msgid "%s: invalid integer parameter (%s returned %d)\n"
+msgid "%s: invalid integer parameter (%s returned %u)\n"
msgstr ""
#: fish/cmds.c:3800
@@ -6090,8 +6090,8 @@ msgstr ""
#: fish/cmds.c:24085 fish/cmds.c:24102 fish/cmds.c:24253 fish/cmds.c:24270
#: fish/cmds.c:24287 fish/cmds.c:24304
#, c-format
-msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: %s: अवैध पूर्णांक पैरामीटर (%s ने %d लौटाया)\n"
+msgid "%s: %s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:5550 fish/cmds.c:5770 fish/cmds.c:5896 fish/cmds.c:6001
#: fish/cmds.c:6898 fish/cmds.c:8359 fish/cmds.c:8457 fish/cmds.c:8478
@@ -7125,7 +7125,7 @@ msgstr ""
#: make-fs/make-fs.c:619
#, c-format
-msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
+msgid "%s: %s: invalid size parameter '%s' (%s returned %u)\n"
msgstr ""
#: make-fs/make-fs.c:819
@@ -7524,7 +7524,7 @@ msgstr ""
#: src/appliance.c:247
#, c-format
-msgid "security: cached appliance %s is not owned by UID %d"
+msgid "security: cached appliance %s is not owned by UID %ju"
msgstr ""
#: src/appliance.c:252
@@ -8023,38 +8023,38 @@ msgstr ""
msgid "setting not found"
msgstr ""
-#: src/info.c:144
+#: src/info.c:152
msgid "qemu-img info: JSON output did not contain 'format' key"
msgstr ""
-#: src/info.c:175
+#: src/info.c:183
msgid "qemu-img info: 'virtual-size' is not representable as a 64 bit integer"
msgstr ""
-#: src/info.c:183
+#: src/info.c:191
msgid "qemu-img info: JSON output did not contain 'virtual-size' key"
msgstr ""
-#: src/info.c:221
+#: src/info.c:229
msgid "qemu-img info: JSON output was not an object"
msgstr ""
-#: src/info.c:287
+#: src/info.c:301
msgid ""
"qemu-img info command produced no output, but didn't return an error status "
"code"
msgstr ""
-#: src/info.c:321
+#: src/info.c:335
#, c-format
msgid "qemu-img info: JSON parse error: %s"
msgstr ""
-#: src/info.c:323
+#: src/info.c:337
msgid "qemu-img info: unknown JSON parse error"
msgstr ""
-#: src/info.c:461
+#: src/info.c:475
#, c-format
msgid "%s: cannot detect virtual size of disk image"
msgstr ""
@@ -8076,7 +8076,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:646
+#: src/inspect-icon.c:643
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
@@ -8127,7 +8127,7 @@ msgstr "you must call guestfs_add_drive before guestfs_launch"
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu launched and contacted daemon, but state != READY"
-#: src/launch-direct.c:1285 src/launch-libvirt.c:1402
+#: src/launch-direct.c:1285 src/launch-libvirt.c:1403
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
@@ -8224,70 +8224,70 @@ msgid ""
"For further help, read the guestfs(3) man page and libguestfs FAQ."
msgstr ""
-#: src/launch-libvirt.c:966
+#: src/launch-libvirt.c:967
#, c-format
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1356
+#: src/launch-libvirt.c:1357
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1485
+#: src/launch-libvirt.c:1486
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1510
+#: src/launch-libvirt.c:1511
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1517
+#: src/launch-libvirt.c:1518
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1847
+#: src/launch-libvirt.c:1848
msgid "could not define libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:1858
+#: src/launch-libvirt.c:1859
msgid "rbd protocol secret must be base64 encoded"
msgstr ""
-#: src/launch-libvirt.c:1862
+#: src/launch-libvirt.c:1863
#, c-format
msgid "base64_decode_alloc: %m"
msgstr ""
-#: src/launch-libvirt.c:1883
+#: src/launch-libvirt.c:1884
msgid "could not set libvirt secret value"
msgstr ""
-#: src/launch-libvirt.c:1896
+#: src/launch-libvirt.c:1897
msgid "could not get UUID from libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:2003
+#: src/launch-libvirt.c:2004
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2054 src/launch-libvirt.c:2087
+#: src/launch-libvirt.c:2055 src/launch-libvirt.c:2088
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:2150
+#: src/launch-libvirt.c:2151
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2181
+#: src/launch-libvirt.c:2182
msgid "could not detach disk from libvirt domain"
msgstr ""
@@ -8636,8 +8636,8 @@ msgstr "libguestfs-test-tool: guestfs_version failed\n"
#: test-tool/test-tool.c:154
#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
-msgstr "libguestfs-test-tool: unexpected command line option 0x%x\n"
+msgid "libguestfs-test-tool: unexpected command line option %d\n"
+msgstr ""
#: test-tool/test-tool.c:161
#, c-format
@@ -8817,3 +8817,9 @@ msgstr ""
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr ""
+
+#~ msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: %s: अवैध पूर्णांक पैरामीटर (%s ने %d लौटाया)\n"
+
+#~ msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+#~ msgstr "libguestfs-test-tool: unexpected command line option 0x%x\n"
diff --git a/po/kn.po b/po/kn.po
index 4267b93..2257858 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-04-26 15:58+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+0100\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/libguestfs/"
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1350
+#: ../v2v/convert_linux.ml:1352
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -235,10 +235,6 @@ msgid ""
"read the man page virt-customize(1).\n"
msgstr ""
-#: ../resize/resize.ml:158
-msgid "%s: empty --expand option"
-msgstr ""
-
#: ../mllib/common_utils.ml:251
msgid "%s: error: %s"
msgstr ""
@@ -400,7 +396,7 @@ msgstr ""
msgid "%s: zero length path in the index file\n"
msgstr ""
-#: ../customize/firstboot.ml:189
+#: ../customize/firstboot.ml:193
msgid ""
"'%s' is missing. This file is required in order to install Windows "
"firstboot scripts. You can get it by building rhsrvany (https://github.com/"
@@ -1868,7 +1864,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1144
+#: ../v2v/convert_linux.ml:1146
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -2067,13 +2063,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:634
+#: ../v2v/convert_linux.ml:636
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:543
+#: ../v2v/convert_linux.ml:545
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2218,7 +2214,7 @@ msgstr ""
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1074
+#: ../v2v/convert_linux.ml:1076
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2268,7 +2264,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1092
+#: ../v2v/convert_linux.ml:1094
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2279,7 +2275,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1076
+#: ../v2v/convert_linux.ml:1078
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2311,7 +2307,7 @@ msgid ""
"This could be a bug in %s."
msgstr ""
-#: ../v2v/convert_linux.ml:794
+#: ../v2v/convert_linux.ml:796
msgid "didn't find grub entry for kernel %s"
msgstr ""
@@ -2367,7 +2363,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1199
+#: ../v2v/convert_linux.ml:1201
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2375,6 +2371,10 @@ msgstr ""
msgid "duplicate operation name (%s)"
msgstr ""
+#: ../resize/resize.ml:158
+msgid "empty --expand option"
+msgstr ""
+
#: ../resize/resize.ml:175
msgid "empty --shrink option"
msgstr ""
@@ -2516,11 +2516,11 @@ msgstr ""
msgid "gpg program is not available"
msgstr ""
-#: ../customize/firstboot.ml:129
+#: ../customize/firstboot.ml:133
msgid "guest type %s is not supported"
msgstr ""
-#: ../customize/firstboot.ml:315
+#: ../customize/firstboot.ml:319
msgid "guest type %s/%s is not supported"
msgstr ""
@@ -2574,7 +2574,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/convert_linux.ml:798
+#: ../v2v/convert_linux.ml:800
msgid "internal error: regular expression did not match '%s'"
msgstr ""
@@ -2594,7 +2594,7 @@ msgstr ""
msgid "invalid password selector '%s'; see the man page"
msgstr ""
-#: ../v2v/convert_linux.ml:782
+#: ../v2v/convert_linux.ml:784
msgid "kernel %s is not under grub tree %s"
msgstr ""
@@ -2679,7 +2679,7 @@ msgstr ""
msgid "no kernel found"
msgstr ""
-#: ../v2v/convert_linux.ml:395
+#: ../v2v/convert_linux.ml:397
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2722,7 +2722,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:749
+#: ../v2v/convert_linux.ml:751
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2984,7 +2984,7 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1243
+#: ../v2v/convert_linux.ml:1245
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
@@ -2999,7 +2999,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:941
+#: ../v2v/convert_linux.ml:943
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3293,11 +3293,11 @@ msgstr ""
msgid "%s: --uuid option cannot be used with -a or -d\n"
msgstr ""
-#: align/scan.c:330
+#: align/scan.c:336
msgid "alignment < 4K"
msgstr ""
-#: align/scan.c:333
+#: align/scan.c:339
msgid "alignment < 64K"
msgstr ""
@@ -3710,7 +3710,7 @@ msgstr "ಒಂದು ಚದುರಿದ(ಸ್ಪಾರ್ಸ್) ಚಿತ್
#: fish/alloc.c:100
#, c-format
-msgid "%s: invalid integer parameter (%s returned %d)\n"
+msgid "%s: invalid integer parameter (%s returned %u)\n"
msgstr ""
#: fish/cmds.c:3800
@@ -6092,8 +6092,8 @@ msgstr ""
#: fish/cmds.c:24085 fish/cmds.c:24102 fish/cmds.c:24253 fish/cmds.c:24270
#: fish/cmds.c:24287 fish/cmds.c:24304
#, c-format
-msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: %s: ಅಮಾನ್ಯವಾದ ಪೂರ್ಣ ನಿಯತಾಂಕ (%s ಮರಳಿಸಲಾಗಿದೆ %d)\n"
+msgid "%s: %s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:5550 fish/cmds.c:5770 fish/cmds.c:5896 fish/cmds.c:6001
#: fish/cmds.c:6898 fish/cmds.c:8359 fish/cmds.c:8457 fish/cmds.c:8478
@@ -7129,7 +7129,7 @@ msgstr ""
#: make-fs/make-fs.c:619
#, c-format
-msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
+msgid "%s: %s: invalid size parameter '%s' (%s returned %u)\n"
msgstr ""
#: make-fs/make-fs.c:819
@@ -7528,7 +7528,7 @@ msgstr ""
#: src/appliance.c:247
#, c-format
-msgid "security: cached appliance %s is not owned by UID %d"
+msgid "security: cached appliance %s is not owned by UID %ju"
msgstr ""
#: src/appliance.c:252
@@ -8027,38 +8027,38 @@ msgstr ""
msgid "setting not found"
msgstr ""
-#: src/info.c:144
+#: src/info.c:152
msgid "qemu-img info: JSON output did not contain 'format' key"
msgstr ""
-#: src/info.c:175
+#: src/info.c:183
msgid "qemu-img info: 'virtual-size' is not representable as a 64 bit integer"
msgstr ""
-#: src/info.c:183
+#: src/info.c:191
msgid "qemu-img info: JSON output did not contain 'virtual-size' key"
msgstr ""
-#: src/info.c:221
+#: src/info.c:229
msgid "qemu-img info: JSON output was not an object"
msgstr ""
-#: src/info.c:287
+#: src/info.c:301
msgid ""
"qemu-img info command produced no output, but didn't return an error status "
"code"
msgstr ""
-#: src/info.c:321
+#: src/info.c:335
#, c-format
msgid "qemu-img info: JSON parse error: %s"
msgstr ""
-#: src/info.c:323
+#: src/info.c:337
msgid "qemu-img info: unknown JSON parse error"
msgstr ""
-#: src/info.c:461
+#: src/info.c:475
#, c-format
msgid "%s: cannot detect virtual size of disk image"
msgstr ""
@@ -8080,7 +8080,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:646
+#: src/inspect-icon.c:643
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
@@ -8131,7 +8131,7 @@ msgstr "ನೀವು guestfs_launch ನ ಮೊದಲು guestfs_add_drive ಅನ
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu ಆರಂಭಗೊಂಡಿದೆ ಹಾಗು ಡೀಮನ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಿದೆ, ಆದರೆ != READY ಸ್ಥಿತಿಯಲ್ಲಿದೆ"
-#: src/launch-direct.c:1285 src/launch-libvirt.c:1402
+#: src/launch-direct.c:1285 src/launch-libvirt.c:1403
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
@@ -8228,70 +8228,70 @@ msgid ""
"For further help, read the guestfs(3) man page and libguestfs FAQ."
msgstr ""
-#: src/launch-libvirt.c:966
+#: src/launch-libvirt.c:967
#, c-format
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1356
+#: src/launch-libvirt.c:1357
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1485
+#: src/launch-libvirt.c:1486
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1510
+#: src/launch-libvirt.c:1511
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1517
+#: src/launch-libvirt.c:1518
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1847
+#: src/launch-libvirt.c:1848
msgid "could not define libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:1858
+#: src/launch-libvirt.c:1859
msgid "rbd protocol secret must be base64 encoded"
msgstr ""
-#: src/launch-libvirt.c:1862
+#: src/launch-libvirt.c:1863
#, c-format
msgid "base64_decode_alloc: %m"
msgstr ""
-#: src/launch-libvirt.c:1883
+#: src/launch-libvirt.c:1884
msgid "could not set libvirt secret value"
msgstr ""
-#: src/launch-libvirt.c:1896
+#: src/launch-libvirt.c:1897
msgid "could not get UUID from libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:2003
+#: src/launch-libvirt.c:2004
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2054 src/launch-libvirt.c:2087
+#: src/launch-libvirt.c:2055 src/launch-libvirt.c:2088
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:2150
+#: src/launch-libvirt.c:2151
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2181
+#: src/launch-libvirt.c:2182
msgid "could not detach disk from libvirt domain"
msgstr ""
@@ -8640,8 +8640,8 @@ msgstr "libguestfs-test-tool: guestfs_version ವಿಫಲಗೊಂಡಿದೆ\
#: test-tool/test-tool.c:154
#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
-msgstr "libguestfs-test-tool: ಅನಿರೀಕ್ಷಿತವಾದ ಆಜ್ಞಾ ಸಾಲಿನ ಆಯ್ಕೆ 0x%x\n"
+msgid "libguestfs-test-tool: unexpected command line option %d\n"
+msgstr ""
#: test-tool/test-tool.c:161
#, c-format
@@ -8821,3 +8821,9 @@ msgstr ""
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr ""
+
+#~ msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: %s: ಅಮಾನ್ಯವಾದ ಪೂರ್ಣ ನಿಯತಾಂಕ (%s ಮರಳಿಸಲಾಗಿದೆ %d)\n"
+
+#~ msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+#~ msgstr "libguestfs-test-tool: ಅನಿರೀಕ್ಷಿತವಾದ ಆಜ್ಞಾ ಸಾಲಿನ ಆಯ್ಕೆ 0x%x\n"
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index ee9f485..50eff70 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.28.10\n"
+"Project-Id-Version: libguestfs 1.28.11\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-05-06 17:30+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+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"
@@ -72,7 +72,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1350
+#: ../v2v/convert_linux.ml:1352
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -234,10 +234,6 @@ msgid ""
"read the man page virt-customize(1).\n"
msgstr ""
-#: ../resize/resize.ml:158
-msgid "%s: empty --expand option"
-msgstr ""
-
#: ../mllib/common_utils.ml:251
msgid "%s: error: %s"
msgstr ""
@@ -399,7 +395,7 @@ msgstr ""
msgid "%s: zero length path in the index file\n"
msgstr ""
-#: ../customize/firstboot.ml:189
+#: ../customize/firstboot.ml:193
msgid ""
"'%s' is missing. This file is required in order to install Windows "
"firstboot scripts. You can get it by building rhsrvany (https://github.com/"
@@ -1867,7 +1863,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1144
+#: ../v2v/convert_linux.ml:1146
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -2066,13 +2062,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:634
+#: ../v2v/convert_linux.ml:636
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:543
+#: ../v2v/convert_linux.ml:545
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2217,7 +2213,7 @@ msgstr ""
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1074
+#: ../v2v/convert_linux.ml:1076
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2267,7 +2263,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1092
+#: ../v2v/convert_linux.ml:1094
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2278,7 +2274,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1076
+#: ../v2v/convert_linux.ml:1078
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2310,7 +2306,7 @@ msgid ""
"This could be a bug in %s."
msgstr ""
-#: ../v2v/convert_linux.ml:794
+#: ../v2v/convert_linux.ml:796
msgid "didn't find grub entry for kernel %s"
msgstr ""
@@ -2366,7 +2362,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1199
+#: ../v2v/convert_linux.ml:1201
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2374,6 +2370,10 @@ msgstr ""
msgid "duplicate operation name (%s)"
msgstr ""
+#: ../resize/resize.ml:158
+msgid "empty --expand option"
+msgstr ""
+
#: ../resize/resize.ml:175
msgid "empty --shrink option"
msgstr ""
@@ -2515,11 +2515,11 @@ msgstr ""
msgid "gpg program is not available"
msgstr ""
-#: ../customize/firstboot.ml:129
+#: ../customize/firstboot.ml:133
msgid "guest type %s is not supported"
msgstr ""
-#: ../customize/firstboot.ml:315
+#: ../customize/firstboot.ml:319
msgid "guest type %s/%s is not supported"
msgstr ""
@@ -2573,7 +2573,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/convert_linux.ml:798
+#: ../v2v/convert_linux.ml:800
msgid "internal error: regular expression did not match '%s'"
msgstr ""
@@ -2593,7 +2593,7 @@ msgstr ""
msgid "invalid password selector '%s'; see the man page"
msgstr ""
-#: ../v2v/convert_linux.ml:782
+#: ../v2v/convert_linux.ml:784
msgid "kernel %s is not under grub tree %s"
msgstr ""
@@ -2678,7 +2678,7 @@ msgstr ""
msgid "no kernel found"
msgstr ""
-#: ../v2v/convert_linux.ml:395
+#: ../v2v/convert_linux.ml:397
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2721,7 +2721,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:749
+#: ../v2v/convert_linux.ml:751
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2983,7 +2983,7 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1243
+#: ../v2v/convert_linux.ml:1245
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
@@ -2998,7 +2998,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:941
+#: ../v2v/convert_linux.ml:943
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3292,11 +3292,11 @@ msgstr ""
msgid "%s: --uuid option cannot be used with -a or -d\n"
msgstr ""
-#: align/scan.c:330
+#: align/scan.c:336
msgid "alignment < 4K"
msgstr ""
-#: align/scan.c:333
+#: align/scan.c:339
msgid "alignment < 64K"
msgstr ""
@@ -3709,7 +3709,7 @@ msgstr ""
#: fish/alloc.c:100
#, c-format
-msgid "%s: invalid integer parameter (%s returned %d)\n"
+msgid "%s: invalid integer parameter (%s returned %u)\n"
msgstr ""
#: fish/cmds.c:3800
@@ -6088,7 +6088,7 @@ msgstr ""
#: fish/cmds.c:24085 fish/cmds.c:24102 fish/cmds.c:24253 fish/cmds.c:24270
#: fish/cmds.c:24287 fish/cmds.c:24304
#, c-format
-msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
+msgid "%s: %s: invalid integer parameter (%s returned %u)\n"
msgstr ""
#: fish/cmds.c:5550 fish/cmds.c:5770 fish/cmds.c:5896 fish/cmds.c:6001
@@ -7115,7 +7115,7 @@ msgstr ""
#: make-fs/make-fs.c:619
#, c-format
-msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
+msgid "%s: %s: invalid size parameter '%s' (%s returned %u)\n"
msgstr ""
#: make-fs/make-fs.c:819
@@ -7514,7 +7514,7 @@ msgstr ""
#: src/appliance.c:247
#, c-format
-msgid "security: cached appliance %s is not owned by UID %d"
+msgid "security: cached appliance %s is not owned by UID %ju"
msgstr ""
#: src/appliance.c:252
@@ -8013,38 +8013,38 @@ msgstr ""
msgid "setting not found"
msgstr ""
-#: src/info.c:144
+#: src/info.c:152
msgid "qemu-img info: JSON output did not contain 'format' key"
msgstr ""
-#: src/info.c:175
+#: src/info.c:183
msgid "qemu-img info: 'virtual-size' is not representable as a 64 bit integer"
msgstr ""
-#: src/info.c:183
+#: src/info.c:191
msgid "qemu-img info: JSON output did not contain 'virtual-size' key"
msgstr ""
-#: src/info.c:221
+#: src/info.c:229
msgid "qemu-img info: JSON output was not an object"
msgstr ""
-#: src/info.c:287
+#: src/info.c:301
msgid ""
"qemu-img info command produced no output, but didn't return an error status "
"code"
msgstr ""
-#: src/info.c:321
+#: src/info.c:335
#, c-format
msgid "qemu-img info: JSON parse error: %s"
msgstr ""
-#: src/info.c:323
+#: src/info.c:337
msgid "qemu-img info: unknown JSON parse error"
msgstr ""
-#: src/info.c:461
+#: src/info.c:475
#, c-format
msgid "%s: cannot detect virtual size of disk image"
msgstr ""
@@ -8066,7 +8066,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:646
+#: src/inspect-icon.c:643
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
@@ -8117,7 +8117,7 @@ msgstr ""
msgid "qemu launched and contacted daemon, but state != READY"
msgstr ""
-#: src/launch-direct.c:1285 src/launch-libvirt.c:1402
+#: src/launch-direct.c:1285 src/launch-libvirt.c:1403
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
@@ -8214,70 +8214,70 @@ msgid ""
"For further help, read the guestfs(3) man page and libguestfs FAQ."
msgstr ""
-#: src/launch-libvirt.c:966
+#: src/launch-libvirt.c:967
#, c-format
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1356
+#: src/launch-libvirt.c:1357
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1485
+#: src/launch-libvirt.c:1486
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1510
+#: src/launch-libvirt.c:1511
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1517
+#: src/launch-libvirt.c:1518
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1847
+#: src/launch-libvirt.c:1848
msgid "could not define libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:1858
+#: src/launch-libvirt.c:1859
msgid "rbd protocol secret must be base64 encoded"
msgstr ""
-#: src/launch-libvirt.c:1862
+#: src/launch-libvirt.c:1863
#, c-format
msgid "base64_decode_alloc: %m"
msgstr ""
-#: src/launch-libvirt.c:1883
+#: src/launch-libvirt.c:1884
msgid "could not set libvirt secret value"
msgstr ""
-#: src/launch-libvirt.c:1896
+#: src/launch-libvirt.c:1897
msgid "could not get UUID from libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:2003
+#: src/launch-libvirt.c:2004
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2054 src/launch-libvirt.c:2087
+#: src/launch-libvirt.c:2055 src/launch-libvirt.c:2088
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:2150
+#: src/launch-libvirt.c:2151
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2181
+#: src/launch-libvirt.c:2182
msgid "could not detach disk from libvirt domain"
msgstr ""
@@ -8626,7 +8626,7 @@ msgstr ""
#: test-tool/test-tool.c:154
#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+msgid "libguestfs-test-tool: unexpected command line option %d\n"
msgstr ""
#: test-tool/test-tool.c:161
diff --git a/po/ml.po b/po/ml.po
index 3703996..872a196 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-04-26 15:58+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+0100\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/libguestfs/"
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1350
+#: ../v2v/convert_linux.ml:1352
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -235,10 +235,6 @@ msgid ""
"read the man page virt-customize(1).\n"
msgstr ""
-#: ../resize/resize.ml:158
-msgid "%s: empty --expand option"
-msgstr ""
-
#: ../mllib/common_utils.ml:251
msgid "%s: error: %s"
msgstr ""
@@ -400,7 +396,7 @@ msgstr ""
msgid "%s: zero length path in the index file\n"
msgstr ""
-#: ../customize/firstboot.ml:189
+#: ../customize/firstboot.ml:193
msgid ""
"'%s' is missing. This file is required in order to install Windows "
"firstboot scripts. You can get it by building rhsrvany (https://github.com/"
@@ -1868,7 +1864,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1144
+#: ../v2v/convert_linux.ml:1146
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -2067,13 +2063,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:634
+#: ../v2v/convert_linux.ml:636
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:543
+#: ../v2v/convert_linux.ml:545
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2218,7 +2214,7 @@ msgstr ""
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1074
+#: ../v2v/convert_linux.ml:1076
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2268,7 +2264,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1092
+#: ../v2v/convert_linux.ml:1094
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2279,7 +2275,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1076
+#: ../v2v/convert_linux.ml:1078
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2311,7 +2307,7 @@ msgid ""
"This could be a bug in %s."
msgstr ""
-#: ../v2v/convert_linux.ml:794
+#: ../v2v/convert_linux.ml:796
msgid "didn't find grub entry for kernel %s"
msgstr ""
@@ -2367,7 +2363,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1199
+#: ../v2v/convert_linux.ml:1201
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2375,6 +2371,10 @@ msgstr ""
msgid "duplicate operation name (%s)"
msgstr ""
+#: ../resize/resize.ml:158
+msgid "empty --expand option"
+msgstr ""
+
#: ../resize/resize.ml:175
msgid "empty --shrink option"
msgstr ""
@@ -2516,11 +2516,11 @@ msgstr ""
msgid "gpg program is not available"
msgstr ""
-#: ../customize/firstboot.ml:129
+#: ../customize/firstboot.ml:133
msgid "guest type %s is not supported"
msgstr ""
-#: ../customize/firstboot.ml:315
+#: ../customize/firstboot.ml:319
msgid "guest type %s/%s is not supported"
msgstr ""
@@ -2574,7 +2574,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/convert_linux.ml:798
+#: ../v2v/convert_linux.ml:800
msgid "internal error: regular expression did not match '%s'"
msgstr ""
@@ -2594,7 +2594,7 @@ msgstr ""
msgid "invalid password selector '%s'; see the man page"
msgstr ""
-#: ../v2v/convert_linux.ml:782
+#: ../v2v/convert_linux.ml:784
msgid "kernel %s is not under grub tree %s"
msgstr ""
@@ -2679,7 +2679,7 @@ msgstr ""
msgid "no kernel found"
msgstr ""
-#: ../v2v/convert_linux.ml:395
+#: ../v2v/convert_linux.ml:397
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2722,7 +2722,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:749
+#: ../v2v/convert_linux.ml:751
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2984,7 +2984,7 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1243
+#: ../v2v/convert_linux.ml:1245
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
@@ -2999,7 +2999,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:941
+#: ../v2v/convert_linux.ml:943
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3293,11 +3293,11 @@ msgstr ""
msgid "%s: --uuid option cannot be used with -a or -d\n"
msgstr ""
-#: align/scan.c:330
+#: align/scan.c:336
msgid "alignment < 4K"
msgstr ""
-#: align/scan.c:333
+#: align/scan.c:339
msgid "alignment < 64K"
msgstr ""
@@ -3710,7 +3710,7 @@ msgstr "ഒരു സ്പാര്സ് ചിത്രം ഉണ്ടാ
#: fish/alloc.c:100
#, c-format
-msgid "%s: invalid integer parameter (%s returned %d)\n"
+msgid "%s: invalid integer parameter (%s returned %u)\n"
msgstr ""
#: fish/cmds.c:3800
@@ -6092,8 +6092,8 @@ msgstr ""
#: fish/cmds.c:24085 fish/cmds.c:24102 fish/cmds.c:24253 fish/cmds.c:24270
#: fish/cmds.c:24287 fish/cmds.c:24304
#, c-format
-msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: %s: അസാധുവായ ഇന്റിജര് പരാമീറ്റര് (%s %d തിരികെ നല്കിയിരിക്കുന്നു)\n"
+msgid "%s: %s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:5550 fish/cmds.c:5770 fish/cmds.c:5896 fish/cmds.c:6001
#: fish/cmds.c:6898 fish/cmds.c:8359 fish/cmds.c:8457 fish/cmds.c:8478
@@ -7127,7 +7127,7 @@ msgstr ""
#: make-fs/make-fs.c:619
#, c-format
-msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
+msgid "%s: %s: invalid size parameter '%s' (%s returned %u)\n"
msgstr ""
#: make-fs/make-fs.c:819
@@ -7526,7 +7526,7 @@ msgstr ""
#: src/appliance.c:247
#, c-format
-msgid "security: cached appliance %s is not owned by UID %d"
+msgid "security: cached appliance %s is not owned by UID %ju"
msgstr ""
#: src/appliance.c:252
@@ -8025,38 +8025,38 @@ msgstr ""
msgid "setting not found"
msgstr ""
-#: src/info.c:144
+#: src/info.c:152
msgid "qemu-img info: JSON output did not contain 'format' key"
msgstr ""
-#: src/info.c:175
+#: src/info.c:183
msgid "qemu-img info: 'virtual-size' is not representable as a 64 bit integer"
msgstr ""
-#: src/info.c:183
+#: src/info.c:191
msgid "qemu-img info: JSON output did not contain 'virtual-size' key"
msgstr ""
-#: src/info.c:221
+#: src/info.c:229
msgid "qemu-img info: JSON output was not an object"
msgstr ""
-#: src/info.c:287
+#: src/info.c:301
msgid ""
"qemu-img info command produced no output, but didn't return an error status "
"code"
msgstr ""
-#: src/info.c:321
+#: src/info.c:335
#, c-format
msgid "qemu-img info: JSON parse error: %s"
msgstr ""
-#: src/info.c:323
+#: src/info.c:337
msgid "qemu-img info: unknown JSON parse error"
msgstr ""
-#: src/info.c:461
+#: src/info.c:475
#, c-format
msgid "%s: cannot detect virtual size of disk image"
msgstr ""
@@ -8078,7 +8078,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:646
+#: src/inspect-icon.c:643
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
@@ -8129,7 +8129,7 @@ msgstr "guestfs_launch-നു് മുമ്പു് guestfs_add_drive വി
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu വിന്യസിച്ചു് ഡെമണുമായി ബന്ധപ്പെട്ടു, പക്ഷേ state != READY"
-#: src/launch-direct.c:1285 src/launch-libvirt.c:1402
+#: src/launch-direct.c:1285 src/launch-libvirt.c:1403
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
@@ -8226,70 +8226,70 @@ msgid ""
"For further help, read the guestfs(3) man page and libguestfs FAQ."
msgstr ""
-#: src/launch-libvirt.c:966
+#: src/launch-libvirt.c:967
#, c-format
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1356
+#: src/launch-libvirt.c:1357
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1485
+#: src/launch-libvirt.c:1486
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1510
+#: src/launch-libvirt.c:1511
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1517
+#: src/launch-libvirt.c:1518
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1847
+#: src/launch-libvirt.c:1848
msgid "could not define libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:1858
+#: src/launch-libvirt.c:1859
msgid "rbd protocol secret must be base64 encoded"
msgstr ""
-#: src/launch-libvirt.c:1862
+#: src/launch-libvirt.c:1863
#, c-format
msgid "base64_decode_alloc: %m"
msgstr ""
-#: src/launch-libvirt.c:1883
+#: src/launch-libvirt.c:1884
msgid "could not set libvirt secret value"
msgstr ""
-#: src/launch-libvirt.c:1896
+#: src/launch-libvirt.c:1897
msgid "could not get UUID from libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:2003
+#: src/launch-libvirt.c:2004
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2054 src/launch-libvirt.c:2087
+#: src/launch-libvirt.c:2055 src/launch-libvirt.c:2088
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:2150
+#: src/launch-libvirt.c:2151
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2181
+#: src/launch-libvirt.c:2182
msgid "could not detach disk from libvirt domain"
msgstr ""
@@ -8638,8 +8638,8 @@ msgstr "libguestfs-test-tool: guestfs_version പരാജയപ്പെട്
#: test-tool/test-tool.c:154
#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
-msgstr "libguestfs-test-tool: അപ്രതീക്ഷിതമായ കമാന്ഡ് ലൈന് ഉപാധി 0x%x\n"
+msgid "libguestfs-test-tool: unexpected command line option %d\n"
+msgstr ""
#: test-tool/test-tool.c:161
#, c-format
@@ -8819,3 +8819,9 @@ msgstr ""
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr ""
+
+#~ msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: %s: അസാധുവായ ഇന്റിജര് പരാമീറ്റര് (%s %d തിരികെ നല്കിയിരിക്കുന്നു)\n"
+
+#~ msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+#~ msgstr "libguestfs-test-tool: അപ്രതീക്ഷിതമായ കമാന്ഡ് ലൈന് ഉപാധി 0x%x\n"
diff --git a/po/mr.po b/po/mr.po
index cb8b733..6e8c73a 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-04-26 15:58+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+0100\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Marathi (http://www.transifex.com/projects/p/libguestfs/"
@@ -74,7 +74,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1350
+#: ../v2v/convert_linux.ml:1352
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -236,10 +236,6 @@ msgid ""
"read the man page virt-customize(1).\n"
msgstr ""
-#: ../resize/resize.ml:158
-msgid "%s: empty --expand option"
-msgstr ""
-
#: ../mllib/common_utils.ml:251
msgid "%s: error: %s"
msgstr ""
@@ -401,7 +397,7 @@ msgstr ""
msgid "%s: zero length path in the index file\n"
msgstr ""
-#: ../customize/firstboot.ml:189
+#: ../customize/firstboot.ml:193
msgid ""
"'%s' is missing. This file is required in order to install Windows "
"firstboot scripts. You can get it by building rhsrvany (https://github.com/"
@@ -1869,7 +1865,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1144
+#: ../v2v/convert_linux.ml:1146
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -2068,13 +2064,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:634
+#: ../v2v/convert_linux.ml:636
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:543
+#: ../v2v/convert_linux.ml:545
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2219,7 +2215,7 @@ msgstr ""
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1074
+#: ../v2v/convert_linux.ml:1076
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2269,7 +2265,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1092
+#: ../v2v/convert_linux.ml:1094
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2280,7 +2276,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1076
+#: ../v2v/convert_linux.ml:1078
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2312,7 +2308,7 @@ msgid ""
"This could be a bug in %s."
msgstr ""
-#: ../v2v/convert_linux.ml:794
+#: ../v2v/convert_linux.ml:796
msgid "didn't find grub entry for kernel %s"
msgstr ""
@@ -2368,7 +2364,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1199
+#: ../v2v/convert_linux.ml:1201
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2376,6 +2372,10 @@ msgstr ""
msgid "duplicate operation name (%s)"
msgstr ""
+#: ../resize/resize.ml:158
+msgid "empty --expand option"
+msgstr ""
+
#: ../resize/resize.ml:175
msgid "empty --shrink option"
msgstr ""
@@ -2517,11 +2517,11 @@ msgstr ""
msgid "gpg program is not available"
msgstr ""
-#: ../customize/firstboot.ml:129
+#: ../customize/firstboot.ml:133
msgid "guest type %s is not supported"
msgstr ""
-#: ../customize/firstboot.ml:315
+#: ../customize/firstboot.ml:319
msgid "guest type %s/%s is not supported"
msgstr ""
@@ -2575,7 +2575,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/convert_linux.ml:798
+#: ../v2v/convert_linux.ml:800
msgid "internal error: regular expression did not match '%s'"
msgstr ""
@@ -2595,7 +2595,7 @@ msgstr ""
msgid "invalid password selector '%s'; see the man page"
msgstr ""
-#: ../v2v/convert_linux.ml:782
+#: ../v2v/convert_linux.ml:784
msgid "kernel %s is not under grub tree %s"
msgstr ""
@@ -2680,7 +2680,7 @@ msgstr ""
msgid "no kernel found"
msgstr ""
-#: ../v2v/convert_linux.ml:395
+#: ../v2v/convert_linux.ml:397
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2723,7 +2723,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:749
+#: ../v2v/convert_linux.ml:751
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2985,7 +2985,7 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1243
+#: ../v2v/convert_linux.ml:1245
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
@@ -3000,7 +3000,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:941
+#: ../v2v/convert_linux.ml:943
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3294,11 +3294,11 @@ msgstr ""
msgid "%s: --uuid option cannot be used with -a or -d\n"
msgstr ""
-#: align/scan.c:330
+#: align/scan.c:336
msgid "alignment < 4K"
msgstr ""
-#: align/scan.c:333
+#: align/scan.c:339
msgid "alignment < 64K"
msgstr ""
@@ -3745,8 +3745,8 @@ msgstr "स्पार्स प्रतिमा निर्माण कर
#: fish/alloc.c:100
#, c-format
-msgid "%s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: अवैध इंटिजर घटक (%s ने %d पुरवले)\n"
+msgid "%s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:3800
msgid "Command"
@@ -6125,8 +6125,8 @@ msgstr "%s: वैकल्पिक घटक \"%s\" दोनवेळा द
#: fish/cmds.c:24085 fish/cmds.c:24102 fish/cmds.c:24253 fish/cmds.c:24270
#: fish/cmds.c:24287 fish/cmds.c:24304
#, c-format
-msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: %s: अवैध इंटीजर घटक (%s ने %d पाठवले)\n"
+msgid "%s: %s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:5550 fish/cmds.c:5770 fish/cmds.c:5896 fish/cmds.c:6001
#: fish/cmds.c:6898 fish/cmds.c:8359 fish/cmds.c:8457 fish/cmds.c:8478
@@ -7194,7 +7194,7 @@ msgstr ""
#: make-fs/make-fs.c:619
#, c-format
-msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
+msgid "%s: %s: invalid size parameter '%s' (%s returned %u)\n"
msgstr ""
#: make-fs/make-fs.c:819
@@ -7593,8 +7593,8 @@ msgstr ""
#: src/appliance.c:247
#, c-format
-msgid "security: cached appliance %s is not owned by UID %d"
-msgstr "सुरक्षा: कॅश्ड् अप्लायंस् %s, UID %d च्या मालकिचे नाही"
+msgid "security: cached appliance %s is not owned by UID %ju"
+msgstr ""
#: src/appliance.c:252
#, c-format
@@ -8092,38 +8092,38 @@ msgstr ""
msgid "setting not found"
msgstr ""
-#: src/info.c:144
+#: src/info.c:152
msgid "qemu-img info: JSON output did not contain 'format' key"
msgstr ""
-#: src/info.c:175
+#: src/info.c:183
msgid "qemu-img info: 'virtual-size' is not representable as a 64 bit integer"
msgstr ""
-#: src/info.c:183
+#: src/info.c:191
msgid "qemu-img info: JSON output did not contain 'virtual-size' key"
msgstr ""
-#: src/info.c:221
+#: src/info.c:229
msgid "qemu-img info: JSON output was not an object"
msgstr ""
-#: src/info.c:287
+#: src/info.c:301
msgid ""
"qemu-img info command produced no output, but didn't return an error status "
"code"
msgstr ""
-#: src/info.c:321
+#: src/info.c:335
#, c-format
msgid "qemu-img info: JSON parse error: %s"
msgstr ""
-#: src/info.c:323
+#: src/info.c:337
msgid "qemu-img info: unknown JSON parse error"
msgstr ""
-#: src/info.c:461
+#: src/info.c:475
#, c-format
msgid "%s: cannot detect virtual size of disk image"
msgstr ""
@@ -8145,7 +8145,7 @@ msgstr "%s चे आकार असमंजसपणे मोठे आह
msgid "could not parse integer in version number: %s"
msgstr "आवृत्ती क्रमांत इंटिजर वाचणे अशक्य: %s"
-#: src/inspect-icon.c:646
+#: src/inspect-icon.c:643
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
@@ -8198,7 +8198,7 @@ msgstr "guestfs_add_drive यांस guestfs_launch च्या अगोद
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu सुरू झाले व डिमन सुरू केले, परंतु state != READY आढळले"
-#: src/launch-direct.c:1285 src/launch-libvirt.c:1402
+#: src/launch-direct.c:1285 src/launch-libvirt.c:1403
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
@@ -8295,70 +8295,70 @@ msgid ""
"For further help, read the guestfs(3) man page and libguestfs FAQ."
msgstr ""
-#: src/launch-libvirt.c:966
+#: src/launch-libvirt.c:967
#, c-format
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1356
+#: src/launch-libvirt.c:1357
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1485
+#: src/launch-libvirt.c:1486
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1510
+#: src/launch-libvirt.c:1511
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1517
+#: src/launch-libvirt.c:1518
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1847
+#: src/launch-libvirt.c:1848
msgid "could not define libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:1858
+#: src/launch-libvirt.c:1859
msgid "rbd protocol secret must be base64 encoded"
msgstr ""
-#: src/launch-libvirt.c:1862
+#: src/launch-libvirt.c:1863
#, c-format
msgid "base64_decode_alloc: %m"
msgstr ""
-#: src/launch-libvirt.c:1883
+#: src/launch-libvirt.c:1884
msgid "could not set libvirt secret value"
msgstr ""
-#: src/launch-libvirt.c:1896
+#: src/launch-libvirt.c:1897
msgid "could not get UUID from libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:2003
+#: src/launch-libvirt.c:2004
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2054 src/launch-libvirt.c:2087
+#: src/launch-libvirt.c:2055 src/launch-libvirt.c:2088
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:2150
+#: src/launch-libvirt.c:2151
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2181
+#: src/launch-libvirt.c:2182
msgid "could not detach disk from libvirt domain"
msgstr ""
@@ -8714,8 +8714,8 @@ msgstr "libguestfs-test-tool: guestfs_version अपयशी\n"
#: test-tool/test-tool.c:154
#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
-msgstr "libguestfs-test-tool: अनपेक्षीत आदेश ओळ पर्याय 0x%x\n"
+msgid "libguestfs-test-tool: unexpected command line option %d\n"
+msgstr ""
#: test-tool/test-tool.c:161
#, c-format
@@ -8903,3 +8903,15 @@ msgstr "virt-win-reg: {p}: रेजिस्ट्री फाइल डाउ
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr "virt-win-reg: {p}: रेजिस्ट्री फाइल अपलोड करणे शक्य नाही: {err}\n"
+
+#~ msgid "%s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: अवैध इंटिजर घटक (%s ने %d पुरवले)\n"
+
+#~ msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: %s: अवैध इंटीजर घटक (%s ने %d पाठवले)\n"
+
+#~ msgid "security: cached appliance %s is not owned by UID %d"
+#~ msgstr "सुरक्षा: कॅश्ड् अप्लायंस् %s, UID %d च्या मालकिचे नाही"
+
+#~ msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+#~ msgstr "libguestfs-test-tool: अनपेक्षीत आदेश ओळ पर्याय 0x%x\n"
diff --git a/po/nl.po b/po/nl.po
index 6ceccb9..b35d72e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-04-26 15:58+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+0100\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/libguestfs/"
@@ -75,7 +75,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1350
+#: ../v2v/convert_linux.ml:1352
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -237,10 +237,6 @@ msgid ""
"read the man page virt-customize(1).\n"
msgstr ""
-#: ../resize/resize.ml:158
-msgid "%s: empty --expand option"
-msgstr ""
-
#: ../mllib/common_utils.ml:251
msgid "%s: error: %s"
msgstr ""
@@ -402,7 +398,7 @@ msgstr ""
msgid "%s: zero length path in the index file\n"
msgstr ""
-#: ../customize/firstboot.ml:189
+#: ../customize/firstboot.ml:193
msgid ""
"'%s' is missing. This file is required in order to install Windows "
"firstboot scripts. You can get it by building rhsrvany (https://github.com/"
@@ -1870,7 +1866,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1144
+#: ../v2v/convert_linux.ml:1146
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -2069,13 +2065,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:634
+#: ../v2v/convert_linux.ml:636
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:543
+#: ../v2v/convert_linux.ml:545
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2220,7 +2216,7 @@ msgstr ""
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1074
+#: ../v2v/convert_linux.ml:1076
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2270,7 +2266,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1092
+#: ../v2v/convert_linux.ml:1094
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2281,7 +2277,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1076
+#: ../v2v/convert_linux.ml:1078
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2313,7 +2309,7 @@ msgid ""
"This could be a bug in %s."
msgstr ""
-#: ../v2v/convert_linux.ml:794
+#: ../v2v/convert_linux.ml:796
msgid "didn't find grub entry for kernel %s"
msgstr ""
@@ -2369,7 +2365,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1199
+#: ../v2v/convert_linux.ml:1201
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2377,6 +2373,10 @@ msgstr ""
msgid "duplicate operation name (%s)"
msgstr ""
+#: ../resize/resize.ml:158
+msgid "empty --expand option"
+msgstr ""
+
#: ../resize/resize.ml:175
msgid "empty --shrink option"
msgstr ""
@@ -2518,11 +2518,11 @@ msgstr ""
msgid "gpg program is not available"
msgstr ""
-#: ../customize/firstboot.ml:129
+#: ../customize/firstboot.ml:133
msgid "guest type %s is not supported"
msgstr ""
-#: ../customize/firstboot.ml:315
+#: ../customize/firstboot.ml:319
msgid "guest type %s/%s is not supported"
msgstr ""
@@ -2576,7 +2576,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/convert_linux.ml:798
+#: ../v2v/convert_linux.ml:800
msgid "internal error: regular expression did not match '%s'"
msgstr ""
@@ -2596,7 +2596,7 @@ msgstr ""
msgid "invalid password selector '%s'; see the man page"
msgstr ""
-#: ../v2v/convert_linux.ml:782
+#: ../v2v/convert_linux.ml:784
msgid "kernel %s is not under grub tree %s"
msgstr ""
@@ -2681,7 +2681,7 @@ msgstr ""
msgid "no kernel found"
msgstr ""
-#: ../v2v/convert_linux.ml:395
+#: ../v2v/convert_linux.ml:397
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2724,7 +2724,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:749
+#: ../v2v/convert_linux.ml:751
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2986,7 +2986,7 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1243
+#: ../v2v/convert_linux.ml:1245
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
@@ -3001,7 +3001,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:941
+#: ../v2v/convert_linux.ml:943
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3295,11 +3295,11 @@ msgstr ""
msgid "%s: --uuid option cannot be used with -a or -d\n"
msgstr "%s: --uuid optie kan met een -a of -d gebruikt worden\n"
-#: align/scan.c:330
+#: align/scan.c:336
msgid "alignment < 4K"
msgstr "uitlijning < 4K"
-#: align/scan.c:333
+#: align/scan.c:339
msgid "alignment < 64K"
msgstr "uitlijning < 64K"
@@ -3750,8 +3750,8 @@ msgstr "gebruik 'sparse file size' om een sparse image aan te maken\n"
#: fish/alloc.c:100
#, c-format
-msgid "%s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: ongeldige integer parameter (%s gaf %d terug)\n"
+msgid "%s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:3800
msgid "Command"
@@ -6146,8 +6146,8 @@ msgstr "%s: optioneel argument \"%s\" tweemaal opgegeven\n"
#: fish/cmds.c:24085 fish/cmds.c:24102 fish/cmds.c:24253 fish/cmds.c:24270
#: fish/cmds.c:24287 fish/cmds.c:24304
#, c-format
-msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: %s: ongeldige geheel getal paramter (%s gaf %d terug)\n"
+msgid "%s: %s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:5550 fish/cmds.c:5770 fish/cmds.c:5896 fish/cmds.c:6001
#: fish/cmds.c:6898 fish/cmds.c:8359 fish/cmds.c:8457 fish/cmds.c:8478
@@ -7304,7 +7304,7 @@ msgstr ""
#: make-fs/make-fs.c:619
#, c-format
-msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
+msgid "%s: %s: invalid size parameter '%s' (%s returned %u)\n"
msgstr ""
#: make-fs/make-fs.c:819
@@ -7720,8 +7720,8 @@ msgstr ""
#: src/appliance.c:247
#, c-format
-msgid "security: cached appliance %s is not owned by UID %d"
-msgstr "beveiliging: UID %2$d is geen eigenaar van toepassing %1$s in cache"
+msgid "security: cached appliance %s is not owned by UID %ju"
+msgstr ""
#: src/appliance.c:252
#, c-format
@@ -8223,38 +8223,38 @@ msgstr ""
msgid "setting not found"
msgstr ""
-#: src/info.c:144
+#: src/info.c:152
msgid "qemu-img info: JSON output did not contain 'format' key"
msgstr ""
-#: src/info.c:175
+#: src/info.c:183
msgid "qemu-img info: 'virtual-size' is not representable as a 64 bit integer"
msgstr ""
-#: src/info.c:183
+#: src/info.c:191
msgid "qemu-img info: JSON output did not contain 'virtual-size' key"
msgstr ""
-#: src/info.c:221
+#: src/info.c:229
msgid "qemu-img info: JSON output was not an object"
msgstr ""
-#: src/info.c:287
+#: src/info.c:301
msgid ""
"qemu-img info command produced no output, but didn't return an error status "
"code"
msgstr ""
-#: src/info.c:321
+#: src/info.c:335
#, c-format
msgid "qemu-img info: JSON parse error: %s"
msgstr ""
-#: src/info.c:323
+#: src/info.c:337
msgid "qemu-img info: unknown JSON parse error"
msgstr ""
-#: src/info.c:461
+#: src/info.c:475
#, c-format
msgid "%s: cannot detect virtual size of disk image"
msgstr "%s: virtuele grootte van schijfimage kan niet gedetecteerd worden"
@@ -8276,7 +8276,7 @@ msgstr "groote van %s is buitensporig groot (%<PRIi64> bytes)"
msgid "could not parse integer in version number: %s"
msgstr "kon integer in versie nummer niet ontleden: %s"
-#: src/inspect-icon.c:646
+#: src/inspect-icon.c:643
#, c-format
msgid "read: %s: unexpected end of file"
msgstr "lezen: %s: onverwacht einde van bestand"
@@ -8331,7 +8331,7 @@ msgid "qemu launched and contacted daemon, but state != READY"
msgstr ""
"qemu gelanceerd en contact opgenomen met daemon, maar toestand != READY"
-#: src/launch-direct.c:1285 src/launch-libvirt.c:1402
+#: src/launch-direct.c:1285 src/launch-libvirt.c:1403
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr "realpath: kon '%s' niet converteren naar een absoluut pad"
@@ -8428,70 +8428,70 @@ msgid ""
"For further help, read the guestfs(3) man page and libguestfs FAQ."
msgstr ""
-#: src/launch-libvirt.c:966
+#: src/launch-libvirt.c:967
#, c-format
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1356
+#: src/launch-libvirt.c:1357
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1485
+#: src/launch-libvirt.c:1486
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1510
+#: src/launch-libvirt.c:1511
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1517
+#: src/launch-libvirt.c:1518
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1847
+#: src/launch-libvirt.c:1848
msgid "could not define libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:1858
+#: src/launch-libvirt.c:1859
msgid "rbd protocol secret must be base64 encoded"
msgstr ""
-#: src/launch-libvirt.c:1862
+#: src/launch-libvirt.c:1863
#, c-format
msgid "base64_decode_alloc: %m"
msgstr ""
-#: src/launch-libvirt.c:1883
+#: src/launch-libvirt.c:1884
msgid "could not set libvirt secret value"
msgstr ""
-#: src/launch-libvirt.c:1896
+#: src/launch-libvirt.c:1897
msgid "could not get UUID from libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:2003
+#: src/launch-libvirt.c:2004
msgid "could not destroy libvirt domain"
msgstr "kon libvirt domein niet vernietigen"
-#: src/launch-libvirt.c:2054 src/launch-libvirt.c:2087
+#: src/launch-libvirt.c:2055 src/launch-libvirt.c:2088
#, c-format
msgid "%s: internal error forming error message"
msgstr "%s: interne fout bij formuleren van foutboodschap"
-#: src/launch-libvirt.c:2150
+#: src/launch-libvirt.c:2151
msgid "could not attach disk to libvirt domain"
msgstr "kon schijf niet koppelen aan libvirt domein"
-#: src/launch-libvirt.c:2181
+#: src/launch-libvirt.c:2182
msgid "could not detach disk from libvirt domain"
msgstr "kon schijf niet loskoppelen van libvirt domein"
@@ -8855,8 +8855,8 @@ msgstr "libguestfs-test-tool: guestfs_version mislukte\n"
#: test-tool/test-tool.c:154
#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
-msgstr "libguestfs-test-tool: onverwachte commando regel optie 0x%x\n"
+msgid "libguestfs-test-tool: unexpected command line option %d\n"
+msgstr ""
#: test-tool/test-tool.c:161
#, c-format
@@ -9052,6 +9052,18 @@ msgstr "virt-win-reg: {p}: kon registry bestand niet downloaden: {err}\n"
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr "virt-win-reg: {p}: kon registry bestand niet uploaden: {err}\n"
+#~ msgid "%s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: ongeldige integer parameter (%s gaf %d terug)\n"
+
+#~ msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: %s: ongeldige geheel getal paramter (%s gaf %d terug)\n"
+
+#~ msgid "security: cached appliance %s is not owned by UID %d"
+#~ msgstr "beveiliging: UID %2$d is geen eigenaar van toepassing %1$s in cache"
+
+#~ msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+#~ msgstr "libguestfs-test-tool: onverwachte commando regel optie 0x%x\n"
+
#~ msgid "create a btrfs snapshot"
#~ msgstr "maak een btrfs snapshot aan"
diff --git a/po/or.po b/po/or.po
index 92c3942..327d486 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-04-26 15:58+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+0100\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Oriya (http://www.transifex.com/projects/p/libguestfs/"
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1350
+#: ../v2v/convert_linux.ml:1352
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -235,10 +235,6 @@ msgid ""
"read the man page virt-customize(1).\n"
msgstr ""
-#: ../resize/resize.ml:158
-msgid "%s: empty --expand option"
-msgstr ""
-
#: ../mllib/common_utils.ml:251
msgid "%s: error: %s"
msgstr ""
@@ -400,7 +396,7 @@ msgstr ""
msgid "%s: zero length path in the index file\n"
msgstr ""
-#: ../customize/firstboot.ml:189
+#: ../customize/firstboot.ml:193
msgid ""
"'%s' is missing. This file is required in order to install Windows "
"firstboot scripts. You can get it by building rhsrvany (https://github.com/"
@@ -1868,7 +1864,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1144
+#: ../v2v/convert_linux.ml:1146
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -2067,13 +2063,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:634
+#: ../v2v/convert_linux.ml:636
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:543
+#: ../v2v/convert_linux.ml:545
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2218,7 +2214,7 @@ msgstr ""
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1074
+#: ../v2v/convert_linux.ml:1076
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2268,7 +2264,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1092
+#: ../v2v/convert_linux.ml:1094
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2279,7 +2275,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1076
+#: ../v2v/convert_linux.ml:1078
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2311,7 +2307,7 @@ msgid ""
"This could be a bug in %s."
msgstr ""
-#: ../v2v/convert_linux.ml:794
+#: ../v2v/convert_linux.ml:796
msgid "didn't find grub entry for kernel %s"
msgstr ""
@@ -2367,7 +2363,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1199
+#: ../v2v/convert_linux.ml:1201
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2375,6 +2371,10 @@ msgstr ""
msgid "duplicate operation name (%s)"
msgstr ""
+#: ../resize/resize.ml:158
+msgid "empty --expand option"
+msgstr ""
+
#: ../resize/resize.ml:175
msgid "empty --shrink option"
msgstr ""
@@ -2516,11 +2516,11 @@ msgstr ""
msgid "gpg program is not available"
msgstr ""
-#: ../customize/firstboot.ml:129
+#: ../customize/firstboot.ml:133
msgid "guest type %s is not supported"
msgstr ""
-#: ../customize/firstboot.ml:315
+#: ../customize/firstboot.ml:319
msgid "guest type %s/%s is not supported"
msgstr ""
@@ -2574,7 +2574,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/convert_linux.ml:798
+#: ../v2v/convert_linux.ml:800
msgid "internal error: regular expression did not match '%s'"
msgstr ""
@@ -2594,7 +2594,7 @@ msgstr ""
msgid "invalid password selector '%s'; see the man page"
msgstr ""
-#: ../v2v/convert_linux.ml:782
+#: ../v2v/convert_linux.ml:784
msgid "kernel %s is not under grub tree %s"
msgstr ""
@@ -2679,7 +2679,7 @@ msgstr ""
msgid "no kernel found"
msgstr ""
-#: ../v2v/convert_linux.ml:395
+#: ../v2v/convert_linux.ml:397
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2722,7 +2722,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:749
+#: ../v2v/convert_linux.ml:751
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2984,7 +2984,7 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1243
+#: ../v2v/convert_linux.ml:1245
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
@@ -2999,7 +2999,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:941
+#: ../v2v/convert_linux.ml:943
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3293,11 +3293,11 @@ msgstr ""
msgid "%s: --uuid option cannot be used with -a or -d\n"
msgstr ""
-#: align/scan.c:330
+#: align/scan.c:336
msgid "alignment < 4K"
msgstr ""
-#: align/scan.c:333
+#: align/scan.c:339
msgid "alignment < 64K"
msgstr ""
@@ -3710,7 +3710,7 @@ msgstr "ଗୋଟିଏ ସ୍ପାର୍ଶ ପ୍ରତିଛବି ନିର
#: fish/alloc.c:100
#, c-format
-msgid "%s: invalid integer parameter (%s returned %d)\n"
+msgid "%s: invalid integer parameter (%s returned %u)\n"
msgstr ""
#: fish/cmds.c:3800
@@ -6090,8 +6090,8 @@ msgstr ""
#: fish/cmds.c:24085 fish/cmds.c:24102 fish/cmds.c:24253 fish/cmds.c:24270
#: fish/cmds.c:24287 fish/cmds.c:24304
#, c-format
-msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: %s: ଅବୈଧ ଗଣନ ସଂଖ୍ୟା ପ୍ରାଚଳ (%s ଫେରାଇଥାଏ %d)\n"
+msgid "%s: %s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:5550 fish/cmds.c:5770 fish/cmds.c:5896 fish/cmds.c:6001
#: fish/cmds.c:6898 fish/cmds.c:8359 fish/cmds.c:8457 fish/cmds.c:8478
@@ -7125,7 +7125,7 @@ msgstr ""
#: make-fs/make-fs.c:619
#, c-format
-msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
+msgid "%s: %s: invalid size parameter '%s' (%s returned %u)\n"
msgstr ""
#: make-fs/make-fs.c:819
@@ -7524,7 +7524,7 @@ msgstr ""
#: src/appliance.c:247
#, c-format
-msgid "security: cached appliance %s is not owned by UID %d"
+msgid "security: cached appliance %s is not owned by UID %ju"
msgstr ""
#: src/appliance.c:252
@@ -8023,38 +8023,38 @@ msgstr ""
msgid "setting not found"
msgstr ""
-#: src/info.c:144
+#: src/info.c:152
msgid "qemu-img info: JSON output did not contain 'format' key"
msgstr ""
-#: src/info.c:175
+#: src/info.c:183
msgid "qemu-img info: 'virtual-size' is not representable as a 64 bit integer"
msgstr ""
-#: src/info.c:183
+#: src/info.c:191
msgid "qemu-img info: JSON output did not contain 'virtual-size' key"
msgstr ""
-#: src/info.c:221
+#: src/info.c:229
msgid "qemu-img info: JSON output was not an object"
msgstr ""
-#: src/info.c:287
+#: src/info.c:301
msgid ""
"qemu-img info command produced no output, but didn't return an error status "
"code"
msgstr ""
-#: src/info.c:321
+#: src/info.c:335
#, c-format
msgid "qemu-img info: JSON parse error: %s"
msgstr ""
-#: src/info.c:323
+#: src/info.c:337
msgid "qemu-img info: unknown JSON parse error"
msgstr ""
-#: src/info.c:461
+#: src/info.c:475
#, c-format
msgid "%s: cannot detect virtual size of disk image"
msgstr ""
@@ -8076,7 +8076,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:646
+#: src/inspect-icon.c:643
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
@@ -8127,7 +8127,7 @@ msgstr "ଆପଣ ନିଶ୍ଚିତ ଭାବରେ guestfs_add_drive କୁ
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu ଆରମ୍ଭ ହୋଇଛି ଏବଂ ଡେମନ ସହିତ ଯୋଗାଯୋଗ ଆରମ୍ଭ କରିଛି, କିନ୍ତୁ ଅବସ୍ଥା != READY"
-#: src/launch-direct.c:1285 src/launch-libvirt.c:1402
+#: src/launch-direct.c:1285 src/launch-libvirt.c:1403
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
@@ -8224,70 +8224,70 @@ msgid ""
"For further help, read the guestfs(3) man page and libguestfs FAQ."
msgstr ""
-#: src/launch-libvirt.c:966
+#: src/launch-libvirt.c:967
#, c-format
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1356
+#: src/launch-libvirt.c:1357
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1485
+#: src/launch-libvirt.c:1486
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1510
+#: src/launch-libvirt.c:1511
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1517
+#: src/launch-libvirt.c:1518
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1847
+#: src/launch-libvirt.c:1848
msgid "could not define libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:1858
+#: src/launch-libvirt.c:1859
msgid "rbd protocol secret must be base64 encoded"
msgstr ""
-#: src/launch-libvirt.c:1862
+#: src/launch-libvirt.c:1863
#, c-format
msgid "base64_decode_alloc: %m"
msgstr ""
-#: src/launch-libvirt.c:1883
+#: src/launch-libvirt.c:1884
msgid "could not set libvirt secret value"
msgstr ""
-#: src/launch-libvirt.c:1896
+#: src/launch-libvirt.c:1897
msgid "could not get UUID from libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:2003
+#: src/launch-libvirt.c:2004
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2054 src/launch-libvirt.c:2087
+#: src/launch-libvirt.c:2055 src/launch-libvirt.c:2088
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:2150
+#: src/launch-libvirt.c:2151
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2181
+#: src/launch-libvirt.c:2182
msgid "could not detach disk from libvirt domain"
msgstr ""
@@ -8636,8 +8636,8 @@ msgstr "libguestfs-test-tool: guestfs_version ବିଫଳ ହୋଇଛି\n"
#: test-tool/test-tool.c:154
#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
-msgstr "libguestfs-test-tool: ଅପ୍ରତ୍ୟାଶିତ ନିର୍ଦ୍ଦେଶନାମା ବିକଳ୍ପ 0x%x\n"
+msgid "libguestfs-test-tool: unexpected command line option %d\n"
+msgstr ""
#: test-tool/test-tool.c:161
#, c-format
@@ -8817,3 +8817,9 @@ msgstr ""
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr ""
+
+#~ msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: %s: ଅବୈଧ ଗଣନ ସଂଖ୍ୟା ପ୍ରାଚଳ (%s ଫେରାଇଥାଏ %d)\n"
+
+#~ msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+#~ msgstr "libguestfs-test-tool: ଅପ୍ରତ୍ୟାଶିତ ନିର୍ଦ୍ଦେଶନାମା ବିକଳ୍ପ 0x%x\n"
diff --git a/po/pa.po b/po/pa.po
index be10c55..5c7bb1f 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-04-26 15:58+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+0100\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/"
@@ -74,7 +74,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1350
+#: ../v2v/convert_linux.ml:1352
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -236,10 +236,6 @@ msgid ""
"read the man page virt-customize(1).\n"
msgstr ""
-#: ../resize/resize.ml:158
-msgid "%s: empty --expand option"
-msgstr ""
-
#: ../mllib/common_utils.ml:251
msgid "%s: error: %s"
msgstr ""
@@ -401,7 +397,7 @@ msgstr ""
msgid "%s: zero length path in the index file\n"
msgstr ""
-#: ../customize/firstboot.ml:189
+#: ../customize/firstboot.ml:193
msgid ""
"'%s' is missing. This file is required in order to install Windows "
"firstboot scripts. You can get it by building rhsrvany (https://github.com/"
@@ -1869,7 +1865,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1144
+#: ../v2v/convert_linux.ml:1146
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -2068,13 +2064,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:634
+#: ../v2v/convert_linux.ml:636
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:543
+#: ../v2v/convert_linux.ml:545
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2219,7 +2215,7 @@ msgstr ""
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1074
+#: ../v2v/convert_linux.ml:1076
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2269,7 +2265,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1092
+#: ../v2v/convert_linux.ml:1094
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2280,7 +2276,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1076
+#: ../v2v/convert_linux.ml:1078
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2312,7 +2308,7 @@ msgid ""
"This could be a bug in %s."
msgstr ""
-#: ../v2v/convert_linux.ml:794
+#: ../v2v/convert_linux.ml:796
msgid "didn't find grub entry for kernel %s"
msgstr ""
@@ -2368,7 +2364,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1199
+#: ../v2v/convert_linux.ml:1201
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2376,6 +2372,10 @@ msgstr ""
msgid "duplicate operation name (%s)"
msgstr ""
+#: ../resize/resize.ml:158
+msgid "empty --expand option"
+msgstr ""
+
#: ../resize/resize.ml:175
msgid "empty --shrink option"
msgstr ""
@@ -2517,11 +2517,11 @@ msgstr ""
msgid "gpg program is not available"
msgstr ""
-#: ../customize/firstboot.ml:129
+#: ../customize/firstboot.ml:133
msgid "guest type %s is not supported"
msgstr ""
-#: ../customize/firstboot.ml:315
+#: ../customize/firstboot.ml:319
msgid "guest type %s/%s is not supported"
msgstr ""
@@ -2575,7 +2575,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/convert_linux.ml:798
+#: ../v2v/convert_linux.ml:800
msgid "internal error: regular expression did not match '%s'"
msgstr ""
@@ -2595,7 +2595,7 @@ msgstr ""
msgid "invalid password selector '%s'; see the man page"
msgstr ""
-#: ../v2v/convert_linux.ml:782
+#: ../v2v/convert_linux.ml:784
msgid "kernel %s is not under grub tree %s"
msgstr ""
@@ -2680,7 +2680,7 @@ msgstr ""
msgid "no kernel found"
msgstr ""
-#: ../v2v/convert_linux.ml:395
+#: ../v2v/convert_linux.ml:397
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2723,7 +2723,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:749
+#: ../v2v/convert_linux.ml:751
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2985,7 +2985,7 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1243
+#: ../v2v/convert_linux.ml:1245
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
@@ -3000,7 +3000,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:941
+#: ../v2v/convert_linux.ml:943
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3294,11 +3294,11 @@ msgstr ""
msgid "%s: --uuid option cannot be used with -a or -d\n"
msgstr ""
-#: align/scan.c:330
+#: align/scan.c:336
msgid "alignment < 4K"
msgstr ""
-#: align/scan.c:333
+#: align/scan.c:339
msgid "alignment < 64K"
msgstr ""
@@ -3745,8 +3745,8 @@ msgstr "ਸਪਾਰਸ ਈਮੇਜ਼ ਬਣਾਉਣ ਲਈ 'sparse file size'
#: fish/alloc.c:100
#, c-format
-msgid "%s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: ਗਲਤ ਪੂਰਨਅੰਕ ਪੈਰਾਮੀਟਰ (%s returned %d)\n"
+msgid "%s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:3800
msgid "Command"
@@ -6124,8 +6124,8 @@ msgstr "%s: ਚੋਣਵੇਂ ਆਰਗੂਮੈਂਟ \"%s\" ਦੋ ਵਾਰ
#: fish/cmds.c:24085 fish/cmds.c:24102 fish/cmds.c:24253 fish/cmds.c:24270
#: fish/cmds.c:24287 fish/cmds.c:24304
#, c-format
-msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: %s: ਗਲਤ ਅੰਕ ਪੈਰਾਮੀਟਰ (%s returned %d)\n"
+msgid "%s: %s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:5550 fish/cmds.c:5770 fish/cmds.c:5896 fish/cmds.c:6001
#: fish/cmds.c:6898 fish/cmds.c:8359 fish/cmds.c:8457 fish/cmds.c:8478
@@ -7191,7 +7191,7 @@ msgstr ""
#: make-fs/make-fs.c:619
#, c-format
-msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
+msgid "%s: %s: invalid size parameter '%s' (%s returned %u)\n"
msgstr ""
#: make-fs/make-fs.c:819
@@ -7590,8 +7590,8 @@ msgstr ""
#: src/appliance.c:247
#, c-format
-msgid "security: cached appliance %s is not owned by UID %d"
-msgstr "ਸੁਰੱਖਿਆ: ਕੈਸ਼ ਜੰਤਰ %s ਨੂੰ UID %d ਦੁਆਰਾ ਨਹੀਂ ਰੋਕਿਆ ਹੈ"
+msgid "security: cached appliance %s is not owned by UID %ju"
+msgstr ""
#: src/appliance.c:252
#, c-format
@@ -8089,38 +8089,38 @@ msgstr ""
msgid "setting not found"
msgstr ""
-#: src/info.c:144
+#: src/info.c:152
msgid "qemu-img info: JSON output did not contain 'format' key"
msgstr ""
-#: src/info.c:175
+#: src/info.c:183
msgid "qemu-img info: 'virtual-size' is not representable as a 64 bit integer"
msgstr ""
-#: src/info.c:183
+#: src/info.c:191
msgid "qemu-img info: JSON output did not contain 'virtual-size' key"
msgstr ""
-#: src/info.c:221
+#: src/info.c:229
msgid "qemu-img info: JSON output was not an object"
msgstr ""
-#: src/info.c:287
+#: src/info.c:301
msgid ""
"qemu-img info command produced no output, but didn't return an error status "
"code"
msgstr ""
-#: src/info.c:321
+#: src/info.c:335
#, c-format
msgid "qemu-img info: JSON parse error: %s"
msgstr ""
-#: src/info.c:323
+#: src/info.c:337
msgid "qemu-img info: unknown JSON parse error"
msgstr ""
-#: src/info.c:461
+#: src/info.c:475
#, c-format
msgid "%s: cannot detect virtual size of disk image"
msgstr ""
@@ -8142,7 +8142,7 @@ msgstr "%s ਦਾ ਅਕਾਰ ਬੇਲੋੜਾ ਹੈ (%<PRIi64> ਬਾਈਟ
msgid "could not parse integer in version number: %s"
msgstr "ਵਰਜਨ ਨੰਬਰ ਵਿੱਚ ਪੂਰਨਅੰਕ ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕਰ ਸਕਿਆ: %s"
-#: src/inspect-icon.c:646
+#: src/inspect-icon.c:643
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
@@ -8195,7 +8195,7 @@ msgstr "you must call guestfs_add_drive before guestfs_launch"
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu launched and contacted daemon, but state != READY"
-#: src/launch-direct.c:1285 src/launch-libvirt.c:1402
+#: src/launch-direct.c:1285 src/launch-libvirt.c:1403
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
@@ -8292,70 +8292,70 @@ msgid ""
"For further help, read the guestfs(3) man page and libguestfs FAQ."
msgstr ""
-#: src/launch-libvirt.c:966
+#: src/launch-libvirt.c:967
#, c-format
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1356
+#: src/launch-libvirt.c:1357
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1485
+#: src/launch-libvirt.c:1486
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1510
+#: src/launch-libvirt.c:1511
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1517
+#: src/launch-libvirt.c:1518
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1847
+#: src/launch-libvirt.c:1848
msgid "could not define libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:1858
+#: src/launch-libvirt.c:1859
msgid "rbd protocol secret must be base64 encoded"
msgstr ""
-#: src/launch-libvirt.c:1862
+#: src/launch-libvirt.c:1863
#, c-format
msgid "base64_decode_alloc: %m"
msgstr ""
-#: src/launch-libvirt.c:1883
+#: src/launch-libvirt.c:1884
msgid "could not set libvirt secret value"
msgstr ""
-#: src/launch-libvirt.c:1896
+#: src/launch-libvirt.c:1897
msgid "could not get UUID from libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:2003
+#: src/launch-libvirt.c:2004
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2054 src/launch-libvirt.c:2087
+#: src/launch-libvirt.c:2055 src/launch-libvirt.c:2088
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:2150
+#: src/launch-libvirt.c:2151
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2181
+#: src/launch-libvirt.c:2182
msgid "could not detach disk from libvirt domain"
msgstr ""
@@ -8712,8 +8712,8 @@ msgstr "libguestfs-test-tool: guestfs_version failed\n"
#: test-tool/test-tool.c:154
#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
-msgstr "libguestfs-test-tool: unexpected command line option 0x%x\n"
+msgid "libguestfs-test-tool: unexpected command line option %d\n"
+msgstr ""
#: test-tool/test-tool.c:161
#, c-format
@@ -8901,3 +8901,15 @@ msgstr "virt-win-reg: {p}: ਰਜਿਸਟਰੀ ਫਾਇਲ ਡਾਊਨਲੋ
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr "virt-win-reg: {p}: ਰਜਿਸਟਰੀ ਫਾਇਲ ਨੂੰ ਅੱਪਲੋਡ ਨਹੀਂ ਕਰ ਸਕਦਾ: {err}\n"
+
+#~ msgid "%s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: ਗਲਤ ਪੂਰਨਅੰਕ ਪੈਰਾਮੀਟਰ (%s returned %d)\n"
+
+#~ msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: %s: ਗਲਤ ਅੰਕ ਪੈਰਾਮੀਟਰ (%s returned %d)\n"
+
+#~ msgid "security: cached appliance %s is not owned by UID %d"
+#~ msgstr "ਸੁਰੱਖਿਆ: ਕੈਸ਼ ਜੰਤਰ %s ਨੂੰ UID %d ਦੁਆਰਾ ਨਹੀਂ ਰੋਕਿਆ ਹੈ"
+
+#~ msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+#~ msgstr "libguestfs-test-tool: unexpected command line option 0x%x\n"
diff --git a/po/pl.po b/po/pl.po
index 562ca1d..cf2b6df 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-04-26 15:58+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+0100\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/libguestfs/"
@@ -77,7 +77,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1350
+#: ../v2v/convert_linux.ml:1352
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -239,10 +239,6 @@ msgid ""
"read the man page virt-customize(1).\n"
msgstr ""
-#: ../resize/resize.ml:158
-msgid "%s: empty --expand option"
-msgstr ""
-
#: ../mllib/common_utils.ml:251
msgid "%s: error: %s"
msgstr ""
@@ -404,7 +400,7 @@ msgstr ""
msgid "%s: zero length path in the index file\n"
msgstr ""
-#: ../customize/firstboot.ml:189
+#: ../customize/firstboot.ml:193
msgid ""
"'%s' is missing. This file is required in order to install Windows "
"firstboot scripts. You can get it by building rhsrvany (https://github.com/"
@@ -1872,7 +1868,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1144
+#: ../v2v/convert_linux.ml:1146
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -2071,13 +2067,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:634
+#: ../v2v/convert_linux.ml:636
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:543
+#: ../v2v/convert_linux.ml:545
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2222,7 +2218,7 @@ msgstr ""
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1074
+#: ../v2v/convert_linux.ml:1076
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2272,7 +2268,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1092
+#: ../v2v/convert_linux.ml:1094
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2283,7 +2279,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1076
+#: ../v2v/convert_linux.ml:1078
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2315,7 +2311,7 @@ msgid ""
"This could be a bug in %s."
msgstr ""
-#: ../v2v/convert_linux.ml:794
+#: ../v2v/convert_linux.ml:796
msgid "didn't find grub entry for kernel %s"
msgstr ""
@@ -2371,7 +2367,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1199
+#: ../v2v/convert_linux.ml:1201
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2379,6 +2375,10 @@ msgstr ""
msgid "duplicate operation name (%s)"
msgstr ""
+#: ../resize/resize.ml:158
+msgid "empty --expand option"
+msgstr ""
+
#: ../resize/resize.ml:175
msgid "empty --shrink option"
msgstr ""
@@ -2520,11 +2520,11 @@ msgstr ""
msgid "gpg program is not available"
msgstr ""
-#: ../customize/firstboot.ml:129
+#: ../customize/firstboot.ml:133
msgid "guest type %s is not supported"
msgstr ""
-#: ../customize/firstboot.ml:315
+#: ../customize/firstboot.ml:319
msgid "guest type %s/%s is not supported"
msgstr ""
@@ -2578,7 +2578,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/convert_linux.ml:798
+#: ../v2v/convert_linux.ml:800
msgid "internal error: regular expression did not match '%s'"
msgstr ""
@@ -2598,7 +2598,7 @@ msgstr ""
msgid "invalid password selector '%s'; see the man page"
msgstr ""
-#: ../v2v/convert_linux.ml:782
+#: ../v2v/convert_linux.ml:784
msgid "kernel %s is not under grub tree %s"
msgstr ""
@@ -2683,7 +2683,7 @@ msgstr ""
msgid "no kernel found"
msgstr ""
-#: ../v2v/convert_linux.ml:395
+#: ../v2v/convert_linux.ml:397
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2726,7 +2726,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:749
+#: ../v2v/convert_linux.ml:751
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2988,7 +2988,7 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1243
+#: ../v2v/convert_linux.ml:1245
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
@@ -3003,7 +3003,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:941
+#: ../v2v/convert_linux.ml:943
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3297,11 +3297,11 @@ msgstr ""
msgid "%s: --uuid option cannot be used with -a or -d\n"
msgstr "%s: opcja --uuid nie może być używana razem z -a lub -d\n"
-#: align/scan.c:330
+#: align/scan.c:336
msgid "alignment < 4K"
msgstr "wyrównanie < 4K"
-#: align/scan.c:333
+#: align/scan.c:339
msgid "alignment < 64K"
msgstr "wyrównanie < 64K"
@@ -3757,8 +3757,8 @@ msgstr "należy użyć \"sparse plik rozmiar\", aby utworzyć rzadki obraz\n"
#: fish/alloc.c:100
#, c-format
-msgid "%s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: nieprawidłowy parametr liczby całkowitej (%s zwróciło %d)\n"
+msgid "%s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:3800
msgid "Command"
@@ -6158,8 +6158,8 @@ msgstr "%s: opcjonalny parametr \"%s\" został podany dwa razy\n"
#: fish/cmds.c:24085 fish/cmds.c:24102 fish/cmds.c:24253 fish/cmds.c:24270
#: fish/cmds.c:24287 fish/cmds.c:24304
#, c-format
-msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: %s: nieprawidłowy parametr liczby całkowitej (%s zwróciło %d)\n"
+msgid "%s: %s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:5550 fish/cmds.c:5770 fish/cmds.c:5896 fish/cmds.c:6001
#: fish/cmds.c:6898 fish/cmds.c:8359 fish/cmds.c:8457 fish/cmds.c:8478
@@ -7322,7 +7322,7 @@ msgstr ""
#: make-fs/make-fs.c:619
#, c-format
-msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
+msgid "%s: %s: invalid size parameter '%s' (%s returned %u)\n"
msgstr ""
#: make-fs/make-fs.c:819
@@ -7738,9 +7738,8 @@ msgstr ""
#: src/appliance.c:247
#, c-format
-msgid "security: cached appliance %s is not owned by UID %d"
+msgid "security: cached appliance %s is not owned by UID %ju"
msgstr ""
-"bezpieczeństwo: przyrząd %s w pamięci podręcznej nie jest własnością UID %d"
#: src/appliance.c:252
#, c-format
@@ -8247,38 +8246,38 @@ msgstr ""
msgid "setting not found"
msgstr ""
-#: src/info.c:144
+#: src/info.c:152
msgid "qemu-img info: JSON output did not contain 'format' key"
msgstr ""
-#: src/info.c:175
+#: src/info.c:183
msgid "qemu-img info: 'virtual-size' is not representable as a 64 bit integer"
msgstr ""
-#: src/info.c:183
+#: src/info.c:191
msgid "qemu-img info: JSON output did not contain 'virtual-size' key"
msgstr ""
-#: src/info.c:221
+#: src/info.c:229
msgid "qemu-img info: JSON output was not an object"
msgstr ""
-#: src/info.c:287
+#: src/info.c:301
msgid ""
"qemu-img info command produced no output, but didn't return an error status "
"code"
msgstr ""
-#: src/info.c:321
+#: src/info.c:335
#, c-format
msgid "qemu-img info: JSON parse error: %s"
msgstr ""
-#: src/info.c:323
+#: src/info.c:337
msgid "qemu-img info: unknown JSON parse error"
msgstr ""
-#: src/info.c:461
+#: src/info.c:475
#, c-format
msgid "%s: cannot detect virtual size of disk image"
msgstr ""
@@ -8300,7 +8299,7 @@ msgstr "rozmiar %s jest nierozsądnie duży (%<PRIi64> bajtów)"
msgid "could not parse integer in version number: %s"
msgstr "nie można przetworzyć liczby całkowitej w numerze wersji: %s"
-#: src/inspect-icon.c:646
+#: src/inspect-icon.c:643
#, c-format
msgid "read: %s: unexpected end of file"
msgstr "odczyt: %s: nieoczekiwany koniec pliku"
@@ -8356,7 +8355,7 @@ msgid "qemu launched and contacted daemon, but state != READY"
msgstr ""
"QEMU zostało uruchomione i skontaktowano się z demonem, ale stan != GOTOWY"
-#: src/launch-direct.c:1285 src/launch-libvirt.c:1402
+#: src/launch-direct.c:1285 src/launch-libvirt.c:1403
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
@@ -8453,70 +8452,70 @@ msgid ""
"For further help, read the guestfs(3) man page and libguestfs FAQ."
msgstr ""
-#: src/launch-libvirt.c:966
+#: src/launch-libvirt.c:967
#, c-format
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1356
+#: src/launch-libvirt.c:1357
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1485
+#: src/launch-libvirt.c:1486
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1510
+#: src/launch-libvirt.c:1511
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1517
+#: src/launch-libvirt.c:1518
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1847
+#: src/launch-libvirt.c:1848
msgid "could not define libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:1858
+#: src/launch-libvirt.c:1859
msgid "rbd protocol secret must be base64 encoded"
msgstr ""
-#: src/launch-libvirt.c:1862
+#: src/launch-libvirt.c:1863
#, c-format
msgid "base64_decode_alloc: %m"
msgstr ""
-#: src/launch-libvirt.c:1883
+#: src/launch-libvirt.c:1884
msgid "could not set libvirt secret value"
msgstr ""
-#: src/launch-libvirt.c:1896
+#: src/launch-libvirt.c:1897
msgid "could not get UUID from libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:2003
+#: src/launch-libvirt.c:2004
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2054 src/launch-libvirt.c:2087
+#: src/launch-libvirt.c:2055 src/launch-libvirt.c:2088
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:2150
+#: src/launch-libvirt.c:2151
msgid "could not attach disk to libvirt domain"
msgstr "niemożna dołączyć dysku do domeny biblioteki libvirt"
-#: src/launch-libvirt.c:2181
+#: src/launch-libvirt.c:2182
msgid "could not detach disk from libvirt domain"
msgstr "nie można odłączyć dysku od domeny biblioteki libvirt"
@@ -8884,8 +8883,8 @@ msgstr "libguestfs-test-tool: guestfs_version się nie powiodło\n"
#: test-tool/test-tool.c:154
#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
-msgstr "libguestfs-test-tool: nieoczekiwana opcja wiersza poleceń 0x%x\n"
+msgid "libguestfs-test-tool: unexpected command line option %d\n"
+msgstr ""
#: test-tool/test-tool.c:161
#, c-format
@@ -9080,6 +9079,20 @@ msgstr "virt-win-reg: {p}: nie można pobrać pliku rejestru: {err}\n"
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr "virt-win-reg: {p}: nie można wysłać pliku rejestru: {err}\n"
+#~ msgid "%s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: nieprawidłowy parametr liczby całkowitej (%s zwróciło %d)\n"
+
+#~ msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: %s: nieprawidłowy parametr liczby całkowitej (%s zwróciło %d)\n"
+
+#~ msgid "security: cached appliance %s is not owned by UID %d"
+#~ msgstr ""
+#~ "bezpieczeństwo: przyrząd %s w pamięci podręcznej nie jest własnością UID "
+#~ "%d"
+
+#~ msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+#~ msgstr "libguestfs-test-tool: nieoczekiwana opcja wiersza poleceń 0x%x\n"
+
#~ msgid "create a btrfs snapshot"
#~ msgstr "tworzy migawkę btrfs"
diff --git a/po/ta.po b/po/ta.po
index 1a7a712..5289029 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-04-26 15:58+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+0100\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Tamil (http://www.transifex.com/projects/p/libguestfs/"
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1350
+#: ../v2v/convert_linux.ml:1352
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -235,10 +235,6 @@ msgid ""
"read the man page virt-customize(1).\n"
msgstr ""
-#: ../resize/resize.ml:158
-msgid "%s: empty --expand option"
-msgstr ""
-
#: ../mllib/common_utils.ml:251
msgid "%s: error: %s"
msgstr ""
@@ -400,7 +396,7 @@ msgstr ""
msgid "%s: zero length path in the index file\n"
msgstr ""
-#: ../customize/firstboot.ml:189
+#: ../customize/firstboot.ml:193
msgid ""
"'%s' is missing. This file is required in order to install Windows "
"firstboot scripts. You can get it by building rhsrvany (https://github.com/"
@@ -1868,7 +1864,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1144
+#: ../v2v/convert_linux.ml:1146
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -2067,13 +2063,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:634
+#: ../v2v/convert_linux.ml:636
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:543
+#: ../v2v/convert_linux.ml:545
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2218,7 +2214,7 @@ msgstr ""
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1074
+#: ../v2v/convert_linux.ml:1076
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2268,7 +2264,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1092
+#: ../v2v/convert_linux.ml:1094
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2279,7 +2275,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1076
+#: ../v2v/convert_linux.ml:1078
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2311,7 +2307,7 @@ msgid ""
"This could be a bug in %s."
msgstr ""
-#: ../v2v/convert_linux.ml:794
+#: ../v2v/convert_linux.ml:796
msgid "didn't find grub entry for kernel %s"
msgstr ""
@@ -2367,7 +2363,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1199
+#: ../v2v/convert_linux.ml:1201
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2375,6 +2371,10 @@ msgstr ""
msgid "duplicate operation name (%s)"
msgstr ""
+#: ../resize/resize.ml:158
+msgid "empty --expand option"
+msgstr ""
+
#: ../resize/resize.ml:175
msgid "empty --shrink option"
msgstr ""
@@ -2516,11 +2516,11 @@ msgstr ""
msgid "gpg program is not available"
msgstr ""
-#: ../customize/firstboot.ml:129
+#: ../customize/firstboot.ml:133
msgid "guest type %s is not supported"
msgstr ""
-#: ../customize/firstboot.ml:315
+#: ../customize/firstboot.ml:319
msgid "guest type %s/%s is not supported"
msgstr ""
@@ -2574,7 +2574,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/convert_linux.ml:798
+#: ../v2v/convert_linux.ml:800
msgid "internal error: regular expression did not match '%s'"
msgstr ""
@@ -2594,7 +2594,7 @@ msgstr ""
msgid "invalid password selector '%s'; see the man page"
msgstr ""
-#: ../v2v/convert_linux.ml:782
+#: ../v2v/convert_linux.ml:784
msgid "kernel %s is not under grub tree %s"
msgstr ""
@@ -2679,7 +2679,7 @@ msgstr ""
msgid "no kernel found"
msgstr ""
-#: ../v2v/convert_linux.ml:395
+#: ../v2v/convert_linux.ml:397
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2722,7 +2722,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:749
+#: ../v2v/convert_linux.ml:751
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2984,7 +2984,7 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1243
+#: ../v2v/convert_linux.ml:1245
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
@@ -2999,7 +2999,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:941
+#: ../v2v/convert_linux.ml:943
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3293,11 +3293,11 @@ msgstr ""
msgid "%s: --uuid option cannot be used with -a or -d\n"
msgstr ""
-#: align/scan.c:330
+#: align/scan.c:336
msgid "alignment < 4K"
msgstr ""
-#: align/scan.c:333
+#: align/scan.c:339
msgid "alignment < 64K"
msgstr ""
@@ -3710,7 +3710,7 @@ msgstr "'ஸ்பார்ஸ் கோப்பு அளவை' பயன்
#: fish/alloc.c:100
#, c-format
-msgid "%s: invalid integer parameter (%s returned %d)\n"
+msgid "%s: invalid integer parameter (%s returned %u)\n"
msgstr ""
#: fish/cmds.c:3800
@@ -6090,7 +6090,7 @@ msgstr ""
#: fish/cmds.c:24085 fish/cmds.c:24102 fish/cmds.c:24253 fish/cmds.c:24270
#: fish/cmds.c:24287 fish/cmds.c:24304
#, c-format
-msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
+msgid "%s: %s: invalid integer parameter (%s returned %u)\n"
msgstr ""
#: fish/cmds.c:5550 fish/cmds.c:5770 fish/cmds.c:5896 fish/cmds.c:6001
@@ -7126,7 +7126,7 @@ msgstr ""
#: make-fs/make-fs.c:619
#, c-format
-msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
+msgid "%s: %s: invalid size parameter '%s' (%s returned %u)\n"
msgstr ""
#: make-fs/make-fs.c:819
@@ -7525,7 +7525,7 @@ msgstr ""
#: src/appliance.c:247
#, c-format
-msgid "security: cached appliance %s is not owned by UID %d"
+msgid "security: cached appliance %s is not owned by UID %ju"
msgstr ""
#: src/appliance.c:252
@@ -8024,38 +8024,38 @@ msgstr ""
msgid "setting not found"
msgstr ""
-#: src/info.c:144
+#: src/info.c:152
msgid "qemu-img info: JSON output did not contain 'format' key"
msgstr ""
-#: src/info.c:175
+#: src/info.c:183
msgid "qemu-img info: 'virtual-size' is not representable as a 64 bit integer"
msgstr ""
-#: src/info.c:183
+#: src/info.c:191
msgid "qemu-img info: JSON output did not contain 'virtual-size' key"
msgstr ""
-#: src/info.c:221
+#: src/info.c:229
msgid "qemu-img info: JSON output was not an object"
msgstr ""
-#: src/info.c:287
+#: src/info.c:301
msgid ""
"qemu-img info command produced no output, but didn't return an error status "
"code"
msgstr ""
-#: src/info.c:321
+#: src/info.c:335
#, c-format
msgid "qemu-img info: JSON parse error: %s"
msgstr ""
-#: src/info.c:323
+#: src/info.c:337
msgid "qemu-img info: unknown JSON parse error"
msgstr ""
-#: src/info.c:461
+#: src/info.c:475
#, c-format
msgid "%s: cannot detect virtual size of disk image"
msgstr ""
@@ -8077,7 +8077,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:646
+#: src/inspect-icon.c:643
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
@@ -8128,7 +8128,7 @@ msgstr "நீங்கள் guestfs_add_drive ஐ guestfs_launchக்கு
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu டொமைனுடன் துவக்கப்பட்டு தொடர்பு கொண்டது, ஆனால் நிலையானது != READY"
-#: src/launch-direct.c:1285 src/launch-libvirt.c:1402
+#: src/launch-direct.c:1285 src/launch-libvirt.c:1403
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
@@ -8225,70 +8225,70 @@ msgid ""
"For further help, read the guestfs(3) man page and libguestfs FAQ."
msgstr ""
-#: src/launch-libvirt.c:966
+#: src/launch-libvirt.c:967
#, c-format
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1356
+#: src/launch-libvirt.c:1357
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1485
+#: src/launch-libvirt.c:1486
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1510
+#: src/launch-libvirt.c:1511
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1517
+#: src/launch-libvirt.c:1518
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1847
+#: src/launch-libvirt.c:1848
msgid "could not define libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:1858
+#: src/launch-libvirt.c:1859
msgid "rbd protocol secret must be base64 encoded"
msgstr ""
-#: src/launch-libvirt.c:1862
+#: src/launch-libvirt.c:1863
#, c-format
msgid "base64_decode_alloc: %m"
msgstr ""
-#: src/launch-libvirt.c:1883
+#: src/launch-libvirt.c:1884
msgid "could not set libvirt secret value"
msgstr ""
-#: src/launch-libvirt.c:1896
+#: src/launch-libvirt.c:1897
msgid "could not get UUID from libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:2003
+#: src/launch-libvirt.c:2004
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2054 src/launch-libvirt.c:2087
+#: src/launch-libvirt.c:2055 src/launch-libvirt.c:2088
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:2150
+#: src/launch-libvirt.c:2151
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2181
+#: src/launch-libvirt.c:2182
msgid "could not detach disk from libvirt domain"
msgstr ""
@@ -8637,8 +8637,8 @@ msgstr "libguestfs-test-tool: guestfs_version தோல்வியுற்ற
#: test-tool/test-tool.c:154
#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
-msgstr "libguestfs-test-tool: எதிர்பாராத கட்டளை வரி விருப்பம் 0x%x\n"
+msgid "libguestfs-test-tool: unexpected command line option %d\n"
+msgstr ""
#: test-tool/test-tool.c:161
#, c-format
@@ -8818,3 +8818,6 @@ msgstr ""
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr ""
+
+#~ msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+#~ msgstr "libguestfs-test-tool: எதிர்பாராத கட்டளை வரி விருப்பம் 0x%x\n"
diff --git a/po/te.po b/po/te.po
index e3eb461..fdc74b0 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-04-26 15:58+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+0100\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/libguestfs/"
@@ -73,7 +73,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr ""
-#: ../v2v/convert_linux.ml:1350
+#: ../v2v/convert_linux.ml:1352
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -235,10 +235,6 @@ msgid ""
"read the man page virt-customize(1).\n"
msgstr ""
-#: ../resize/resize.ml:158
-msgid "%s: empty --expand option"
-msgstr ""
-
#: ../mllib/common_utils.ml:251
msgid "%s: error: %s"
msgstr ""
@@ -400,7 +396,7 @@ msgstr ""
msgid "%s: zero length path in the index file\n"
msgstr ""
-#: ../customize/firstboot.ml:189
+#: ../customize/firstboot.ml:193
msgid ""
"'%s' is missing. This file is required in order to install Windows "
"firstboot scripts. You can get it by building rhsrvany (https://github.com/"
@@ -1868,7 +1864,7 @@ msgid ""
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
msgstr ""
-#: ../v2v/convert_linux.ml:1144
+#: ../v2v/convert_linux.ml:1146
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -2067,13 +2063,13 @@ msgid ""
"%!"
msgstr ""
-#: ../v2v/convert_linux.ml:634
+#: ../v2v/convert_linux.ml:636
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
msgstr ""
-#: ../v2v/convert_linux.ml:543
+#: ../v2v/convert_linux.ml:545
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2218,7 +2214,7 @@ msgstr ""
msgid "connection closed"
msgstr ""
-#: ../v2v/convert_linux.ml:1074
+#: ../v2v/convert_linux.ml:1076
msgid "could not add grub2 serial console (ignored)"
msgstr ""
@@ -2268,7 +2264,7 @@ msgid ""
"line. Is it really an OVirt or RHEV-M %s? The original error is: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1092
+#: ../v2v/convert_linux.ml:1094
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2279,7 +2275,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1076
+#: ../v2v/convert_linux.ml:1078
msgid "could not remove grub2 serial console (ignored)"
msgstr ""
@@ -2311,7 +2307,7 @@ msgid ""
"This could be a bug in %s."
msgstr ""
-#: ../v2v/convert_linux.ml:794
+#: ../v2v/convert_linux.ml:796
msgid "didn't find grub entry for kernel %s"
msgstr ""
@@ -2367,7 +2363,7 @@ msgstr ""
msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:1199
+#: ../v2v/convert_linux.ml:1201
msgid "don't know how to update %s which loads the %s module"
msgstr ""
@@ -2375,6 +2371,10 @@ msgstr ""
msgid "duplicate operation name (%s)"
msgstr ""
+#: ../resize/resize.ml:158
+msgid "empty --expand option"
+msgstr ""
+
#: ../resize/resize.ml:175
msgid "empty --shrink option"
msgstr ""
@@ -2516,11 +2516,11 @@ msgstr ""
msgid "gpg program is not available"
msgstr ""
-#: ../customize/firstboot.ml:129
+#: ../customize/firstboot.ml:133
msgid "guest type %s is not supported"
msgstr ""
-#: ../customize/firstboot.ml:315
+#: ../customize/firstboot.ml:319
msgid "guest type %s/%s is not supported"
msgstr ""
@@ -2574,7 +2574,7 @@ msgstr ""
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr ""
-#: ../v2v/convert_linux.ml:798
+#: ../v2v/convert_linux.ml:800
msgid "internal error: regular expression did not match '%s'"
msgstr ""
@@ -2594,7 +2594,7 @@ msgstr ""
msgid "invalid password selector '%s'; see the man page"
msgstr ""
-#: ../v2v/convert_linux.ml:782
+#: ../v2v/convert_linux.ml:784
msgid "kernel %s is not under grub tree %s"
msgstr ""
@@ -2679,7 +2679,7 @@ msgstr ""
msgid "no kernel found"
msgstr ""
-#: ../v2v/convert_linux.ml:395
+#: ../v2v/convert_linux.ml:397
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -2722,7 +2722,7 @@ msgstr ""
msgid "ntfsresize"
msgstr ""
-#: ../v2v/convert_linux.ml:749
+#: ../v2v/convert_linux.ml:751
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -2984,7 +2984,7 @@ msgstr ""
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1243
+#: ../v2v/convert_linux.ml:1245
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
@@ -2999,7 +2999,7 @@ msgid ""
"Original error message: %s"
msgstr ""
-#: ../v2v/convert_linux.ml:941
+#: ../v2v/convert_linux.ml:943
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3293,11 +3293,11 @@ msgstr ""
msgid "%s: --uuid option cannot be used with -a or -d\n"
msgstr ""
-#: align/scan.c:330
+#: align/scan.c:336
msgid "alignment < 4K"
msgstr ""
-#: align/scan.c:333
+#: align/scan.c:339
msgid "alignment < 64K"
msgstr ""
@@ -3710,7 +3710,7 @@ msgstr "స్పార్స్ ప్రతిబింబమును సృ
#: fish/alloc.c:100
#, c-format
-msgid "%s: invalid integer parameter (%s returned %d)\n"
+msgid "%s: invalid integer parameter (%s returned %u)\n"
msgstr ""
#: fish/cmds.c:3800
@@ -6089,7 +6089,7 @@ msgstr ""
#: fish/cmds.c:24085 fish/cmds.c:24102 fish/cmds.c:24253 fish/cmds.c:24270
#: fish/cmds.c:24287 fish/cmds.c:24304
#, c-format
-msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
+msgid "%s: %s: invalid integer parameter (%s returned %u)\n"
msgstr ""
#: fish/cmds.c:5550 fish/cmds.c:5770 fish/cmds.c:5896 fish/cmds.c:6001
@@ -7123,7 +7123,7 @@ msgstr ""
#: make-fs/make-fs.c:619
#, c-format
-msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
+msgid "%s: %s: invalid size parameter '%s' (%s returned %u)\n"
msgstr ""
#: make-fs/make-fs.c:819
@@ -7522,7 +7522,7 @@ msgstr ""
#: src/appliance.c:247
#, c-format
-msgid "security: cached appliance %s is not owned by UID %d"
+msgid "security: cached appliance %s is not owned by UID %ju"
msgstr ""
#: src/appliance.c:252
@@ -8021,38 +8021,38 @@ msgstr ""
msgid "setting not found"
msgstr ""
-#: src/info.c:144
+#: src/info.c:152
msgid "qemu-img info: JSON output did not contain 'format' key"
msgstr ""
-#: src/info.c:175
+#: src/info.c:183
msgid "qemu-img info: 'virtual-size' is not representable as a 64 bit integer"
msgstr ""
-#: src/info.c:183
+#: src/info.c:191
msgid "qemu-img info: JSON output did not contain 'virtual-size' key"
msgstr ""
-#: src/info.c:221
+#: src/info.c:229
msgid "qemu-img info: JSON output was not an object"
msgstr ""
-#: src/info.c:287
+#: src/info.c:301
msgid ""
"qemu-img info command produced no output, but didn't return an error status "
"code"
msgstr ""
-#: src/info.c:321
+#: src/info.c:335
#, c-format
msgid "qemu-img info: JSON parse error: %s"
msgstr ""
-#: src/info.c:323
+#: src/info.c:337
msgid "qemu-img info: unknown JSON parse error"
msgstr ""
-#: src/info.c:461
+#: src/info.c:475
#, c-format
msgid "%s: cannot detect virtual size of disk image"
msgstr ""
@@ -8074,7 +8074,7 @@ msgstr ""
msgid "could not parse integer in version number: %s"
msgstr ""
-#: src/inspect-icon.c:646
+#: src/inspect-icon.c:643
#, c-format
msgid "read: %s: unexpected end of file"
msgstr ""
@@ -8125,7 +8125,7 @@ msgstr "guestfs_launchకు ముందుగా మీరు guestfs_add_driv
msgid "qemu launched and contacted daemon, but state != READY"
msgstr "qemu ఆరంభించబడింది మరియు డెమోన్ను సంప్రదించింది, అయితే state != READY"
-#: src/launch-direct.c:1285 src/launch-libvirt.c:1402
+#: src/launch-direct.c:1285 src/launch-libvirt.c:1403
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr ""
@@ -8222,70 +8222,70 @@ msgid ""
"For further help, read the guestfs(3) man page and libguestfs FAQ."
msgstr ""
-#: src/launch-libvirt.c:966
+#: src/launch-libvirt.c:967
#, c-format
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr ""
-#: src/launch-libvirt.c:1356
+#: src/launch-libvirt.c:1357
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr ""
-#: src/launch-libvirt.c:1485
+#: src/launch-libvirt.c:1486
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
msgstr ""
-#: src/launch-libvirt.c:1510
+#: src/launch-libvirt.c:1511
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1517
+#: src/launch-libvirt.c:1518
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
"'--format' option, or via the optional 'format' argument to 'add-drive'."
msgstr ""
-#: src/launch-libvirt.c:1847
+#: src/launch-libvirt.c:1848
msgid "could not define libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:1858
+#: src/launch-libvirt.c:1859
msgid "rbd protocol secret must be base64 encoded"
msgstr ""
-#: src/launch-libvirt.c:1862
+#: src/launch-libvirt.c:1863
#, c-format
msgid "base64_decode_alloc: %m"
msgstr ""
-#: src/launch-libvirt.c:1883
+#: src/launch-libvirt.c:1884
msgid "could not set libvirt secret value"
msgstr ""
-#: src/launch-libvirt.c:1896
+#: src/launch-libvirt.c:1897
msgid "could not get UUID from libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:2003
+#: src/launch-libvirt.c:2004
msgid "could not destroy libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2054 src/launch-libvirt.c:2087
+#: src/launch-libvirt.c:2055 src/launch-libvirt.c:2088
#, c-format
msgid "%s: internal error forming error message"
msgstr ""
-#: src/launch-libvirt.c:2150
+#: src/launch-libvirt.c:2151
msgid "could not attach disk to libvirt domain"
msgstr ""
-#: src/launch-libvirt.c:2181
+#: src/launch-libvirt.c:2182
msgid "could not detach disk from libvirt domain"
msgstr ""
@@ -8634,8 +8634,8 @@ msgstr "libguestfs-test-tool: guestfs_version విఫలమైంది\n"
#: test-tool/test-tool.c:154
#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
-msgstr "libguestfs-test-tool: అనుకోని కమాండ్ లైన్ ఐచ్చికము 0x%x\n"
+msgid "libguestfs-test-tool: unexpected command line option %d\n"
+msgstr ""
#: test-tool/test-tool.c:161
#, c-format
@@ -8815,3 +8815,6 @@ msgstr ""
#, perl-brace-format
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
msgstr ""
+
+#~ msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+#~ msgstr "libguestfs-test-tool: అనుకోని కమాండ్ లైన్ ఐచ్చికము 0x%x\n"
diff --git a/po/uk.po b/po/uk.po
index 08d2ec3..d47c97f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2015-04-26 15:58+0100\n"
+"POT-Creation-Date: 2015-07-16 15:05+0100\n"
"PO-Revision-Date: 2014-10-18 08:00+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libguestfs/"
@@ -90,7 +90,7 @@ msgstr ""
msgid "%s option used more than once on the command line"
msgstr "у командному рядку параметр %s використано декілька разів"
-#: ../v2v/convert_linux.ml:1350
+#: ../v2v/convert_linux.ml:1352
msgid ""
"%s references unknown device \"%s\". You may have to fix this entry "
"manually after conversion."
@@ -301,10 +301,6 @@ msgstr ""
"Коротке резюме щодо параметрів наведено нижче. Докладніший опис\n"
"можна знайти на сторінці підручника (man) virt-customize(1).\n"
-#: ../resize/resize.ml:158
-msgid "%s: empty --expand option"
-msgstr "%s: порожній параметр --expand"
-
#: ../mllib/common_utils.ml:251
msgid "%s: error: %s"
msgstr "%s: помилка: %s"
@@ -498,7 +494,7 @@ msgstr ""
msgid "%s: zero length path in the index file\n"
msgstr ""
-#: ../customize/firstboot.ml:189
+#: ../customize/firstboot.ml:193
msgid ""
"'%s' is missing. This file is required in order to install Windows "
"firstboot scripts. You can get it by building rhsrvany (https://github.com/"
@@ -2131,7 +2127,7 @@ msgstr ""
" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
" IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
-#: ../v2v/convert_linux.ml:1144
+#: ../v2v/convert_linux.ml:1146
msgid ""
"The display driver was updated to '%s', but X11 does not seem to be "
"installed in the guest. X may not function correctly."
@@ -2393,7 +2389,7 @@ msgstr ""
"Використовуємо попередньо зібраний файл %s як оверлей…\n"
"%!"
-#: ../v2v/convert_linux.ml:634
+#: ../v2v/convert_linux.ml:636
msgid ""
"VMware tools was detected, but uninstallation failed. The error message "
"was: %s (ignored)"
@@ -2401,7 +2397,7 @@ msgstr ""
"Виявлено засоби VMware, але спроба вилучення зазнала невдачі. Повідомлення "
"щодо помилки: %s (проігноровано)"
-#: ../v2v/convert_linux.ml:543
+#: ../v2v/convert_linux.ml:545
msgid ""
"VirtualBox Guest Additions were detected, but uninstallation failed. The "
"error message was: %s (ignored)"
@@ -2577,7 +2573,7 @@ msgstr ""
msgid "connection closed"
msgstr "з'єднання закрито"
-#: ../v2v/convert_linux.ml:1074
+#: ../v2v/convert_linux.ml:1076
msgid "could not add grub2 serial console (ignored)"
msgstr "не вдалося додати послідовну консоль grub2 (проігноровано)"
@@ -2636,7 +2632,7 @@ msgstr ""
"командному рядку. Чи справді це %s OVirt або RHEV-M? Початкове повідомлення "
"щодо помилки: %s"
-#: ../v2v/convert_linux.ml:1092
+#: ../v2v/convert_linux.ml:1094
msgid ""
"could not rebuild grub2 configuration file (%s). This may mean that grub "
"output will not be sent to the serial port, but otherwise should be "
@@ -2650,7 +2646,7 @@ msgstr ""
msgid "could not refresh libvirt pool %s"
msgstr "не вдалося оновити буфер libvirt %s"
-#: ../v2v/convert_linux.ml:1076
+#: ../v2v/convert_linux.ml:1078
msgid "could not remove grub2 serial console (ignored)"
msgstr "не вдалося вилучити послідовну консоль grub2 (проігноровано)"
@@ -2686,7 +2682,7 @@ msgstr ""
"decode_utf16le: рядок Windows, здається, не містить даних у кодуванні UTF16-"
"LE. Ймовірно, це вада у %s."
-#: ../v2v/convert_linux.ml:794
+#: ../v2v/convert_linux.ml:796
msgid "didn't find grub entry for kernel %s"
msgstr "не знайдено запис grub для ядра %s"
@@ -2757,7 +2753,7 @@ msgid "don't know how to remove packages using %s: packages: %s"
msgstr ""
"спосіб вилучення пакунків за допомогою %s невідомий програмі: пакунки: %s"
-#: ../v2v/convert_linux.ml:1199
+#: ../v2v/convert_linux.ml:1201
msgid "don't know how to update %s which loads the %s module"
msgstr "спосіб оновлення %s, який завантажує модуль %s, невідомий програмі"
@@ -2765,6 +2761,10 @@ msgstr "спосіб оновлення %s, який завантажує мод
msgid "duplicate operation name (%s)"
msgstr "дублювання назви операції (%s)"
+#: ../resize/resize.ml:158
+msgid "empty --expand option"
+msgstr ""
+
#: ../resize/resize.ml:175
msgid "empty --shrink option"
msgstr "порожній параметр --shrink"
@@ -2918,11 +2918,11 @@ msgstr ""
msgid "gpg program is not available"
msgstr "немає доступу до програми gpg"
-#: ../customize/firstboot.ml:129
+#: ../customize/firstboot.ml:133
msgid "guest type %s is not supported"
msgstr "підтримки типу гостьової системи %s не передбачено"
-#: ../customize/firstboot.ml:315
+#: ../customize/firstboot.ml:319
msgid "guest type %s/%s is not supported"
msgstr "підтримки типу гостьової системи %s/%s не передбачено"
@@ -2979,7 +2979,7 @@ msgstr "внутрішня помилка: файл оверлею пошкод
msgid "internal error: qemu-img did not create overlay with backing file"
msgstr "внутрішня помилка: qemu-img не створено оверлею із резервним файлом"
-#: ../v2v/convert_linux.ml:798
+#: ../v2v/convert_linux.ml:800
msgid "internal error: regular expression did not match '%s'"
msgstr ""
@@ -2999,7 +2999,7 @@ msgstr ""
msgid "invalid password selector '%s'; see the man page"
msgstr ""
-#: ../v2v/convert_linux.ml:782
+#: ../v2v/convert_linux.ml:784
msgid "kernel %s is not under grub tree %s"
msgstr "ядро %s перебуває поза ієрархією grub %s"
@@ -3100,7 +3100,7 @@ msgstr ""
msgid "no kernel found"
msgstr ""
-#: ../v2v/convert_linux.ml:395
+#: ../v2v/convert_linux.ml:397
msgid ""
"no kernels were found in the grub configuration.\n"
"\n"
@@ -3153,7 +3153,7 @@ msgstr ""
msgid "ntfsresize"
msgstr "ntfsresize"
-#: ../v2v/convert_linux.ml:749
+#: ../v2v/convert_linux.ml:751
msgid ""
"only Xen kernels are installed in this guest.\n"
"\n"
@@ -3463,7 +3463,7 @@ msgstr "для цього типу гостьових систем не можн
msgid "too many parameters, expecting 'os-version'"
msgstr ""
-#: ../v2v/convert_linux.ml:1243
+#: ../v2v/convert_linux.ml:1245
msgid ""
"unable to find any valid modprobe configuration file such as /etc/modprobe."
"conf"
@@ -3486,7 +3486,7 @@ msgstr ""
"\n"
"Початкове повідомлення щодо помилки: %s"
-#: ../v2v/convert_linux.ml:941
+#: ../v2v/convert_linux.ml:943
msgid ""
"unable to rebuild initrd (%s) because mkinitrd or dracut was not found in "
"the guest"
@@ -3814,11 +3814,11 @@ msgstr "%s: зібрано без підтримки libvirt.\n"
msgid "%s: --uuid option cannot be used with -a or -d\n"
msgstr "%s: параметр --uuid не можна використовувати разом з -a або -d\n"
-#: align/scan.c:330
+#: align/scan.c:336
msgid "alignment < 4K"
msgstr "вирівнювання < 4кБ"
-#: align/scan.c:333
+#: align/scan.c:339
msgid "alignment < 64K"
msgstr "вирівнювання < 64кБ"
@@ -4452,8 +4452,8 @@ msgstr ""
#: fish/alloc.c:100
#, c-format
-msgid "%s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: некоректний цілий параметр (%s повернуто %d)\n"
+msgid "%s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:3800
msgid "Command"
@@ -6881,8 +6881,8 @@ msgstr "%s: додатковий аргумент «%s» вказано двіч
#: fish/cmds.c:24085 fish/cmds.c:24102 fish/cmds.c:24253 fish/cmds.c:24270
#: fish/cmds.c:24287 fish/cmds.c:24304
#, c-format
-msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
-msgstr "%s: %s: некоректний цілий параметр (%s повернуто %d)\n"
+msgid "%s: %s: invalid integer parameter (%s returned %u)\n"
+msgstr ""
#: fish/cmds.c:5550 fish/cmds.c:5770 fish/cmds.c:5896 fish/cmds.c:6001
#: fish/cmds.c:6898 fish/cmds.c:8359 fish/cmds.c:8457 fish/cmds.c:8478
@@ -8231,8 +8231,8 @@ msgstr "%s: %s: невідомий формат стискання вхідни
#: make-fs/make-fs.c:619
#, c-format
-msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
-msgstr "%s: %s: некоректний параметр розміру «%s» (%s повернуто %d)\n"
+msgid "%s: %s: invalid size parameter '%s' (%s returned %u)\n"
+msgstr ""
#: make-fs/make-fs.c:819
#, c-format
@@ -8710,8 +8710,8 @@ msgstr ""
#: src/appliance.c:247
#, c-format
-msgid "security: cached appliance %s is not owned by UID %d"
-msgstr "безпека: кешований пристрій %s не належить UID %d"
+msgid "security: cached appliance %s is not owned by UID %ju"
+msgstr ""
#: src/appliance.c:252
#, c-format
@@ -9253,27 +9253,27 @@ msgstr "надто мале значення для розміру пам’ят
msgid "setting not found"
msgstr "параметра не знайдено"
-#: src/info.c:144
+#: src/info.c:152
msgid "qemu-img info: JSON output did not contain 'format' key"
msgstr ""
"Інформація від qemu-img: дані, виведені JSON, не містять ключа «format»"
-#: src/info.c:175
+#: src/info.c:183
msgid "qemu-img info: 'virtual-size' is not representable as a 64 bit integer"
msgstr ""
"Інформація від qemu-img: «virtual-size» не можна представити як 64-бітове "
"ціле число"
-#: src/info.c:183
+#: src/info.c:191
msgid "qemu-img info: JSON output did not contain 'virtual-size' key"
msgstr ""
"Інформація від qemu-img: дані, виведені JSON, не містять ключа «virtual-size»"
-#: src/info.c:221
+#: src/info.c:229
msgid "qemu-img info: JSON output was not an object"
msgstr "Інформація від qemu-img: дані, виведені JSON, не є об’єктом"
-#: src/info.c:287
+#: src/info.c:301
msgid ""
"qemu-img info command produced no output, but didn't return an error status "
"code"
@@ -9281,16 +9281,16 @@ msgstr ""
"командою info qemu-img не виведено жодних даних, але і не повернуто коду "
"стану помилки"
-#: src/info.c:321
+#: src/info.c:335
#, c-format
msgid "qemu-img info: JSON parse error: %s"
msgstr "Інформація від qemu-img: помилка під час обробки JSON: %s"
-#: src/info.c:323
+#: src/info.c:337
msgid "qemu-img info: unknown JSON parse error"
msgstr "Інформація від qemu-img: невідома помилка під час обробки JSON"
-#: src/info.c:461
+#: src/info.c:475
#, c-format
msgid "%s: cannot detect virtual size of disk image"
msgstr "%s: не вдалося визначити віртуальний розмір образу диска"
@@ -9312,7 +9312,7 @@ msgstr "розмір %s неймовірно великий (%<PRIi64> байт
msgid "could not parse integer in version number: %s"
msgstr "не вдалося обробити ціле число у номері версії: %s"
-#: src/inspect-icon.c:646
+#: src/inspect-icon.c:643
#, c-format
msgid "read: %s: unexpected end of file"
msgstr "читання: %s: неочікуваний кінець файла"
@@ -9374,7 +9374,7 @@ msgstr ""
"qemu запущено, встановлено зв’язок з фоновою службою, але стан процесу не "
"дорівнює READY"
-#: src/launch-direct.c:1285 src/launch-libvirt.c:1402
+#: src/launch-direct.c:1285 src/launch-libvirt.c:1403
#, c-format
msgid "realpath: could not convert '%s' to absolute path"
msgstr "realpath: не вдалося перетворити «%s» на абсолютний шлях"
@@ -9503,16 +9503,16 @@ msgstr ""
"guestfs(3) та списком поширених питань щодо libguestfs та відповідей\n"
"на ці питання."
-#: src/launch-libvirt.c:966
+#: src/launch-libvirt.c:967
#, c-format
msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
msgstr "%s:%d: помилка під час побудови XML для libvirt поряд з викликом «%s»"
-#: src/launch-libvirt.c:1356
+#: src/launch-libvirt.c:1357
msgid "'iface' parameter is not supported by the libvirt backend"
msgstr "підтримки параметра «iface» у модулі libvirt не передбачено"
-#: src/launch-libvirt.c:1485
+#: src/launch-libvirt.c:1486
msgid ""
"libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
"try setting LIBGUESTFS_BACKEND=direct"
@@ -9520,7 +9520,7 @@ msgstr ""
"у libvirt не передбачено підтримки драйверів протоколів curl qemu (ftp, http "
"тощо); спробуйте встановити LIBGUESTFS_BACKEND=direct"
-#: src/launch-libvirt.c:1510
+#: src/launch-libvirt.c:1511
msgid ""
"could not auto-detect the format.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
@@ -9532,7 +9532,7 @@ msgstr ""
"параметра «--format» або за допомогою додаткового параметра аргументу "
"формату до «add-drive»."
-#: src/launch-libvirt.c:1517
+#: src/launch-libvirt.c:1518
msgid ""
"could not auto-detect the format when using a non-file protocol.\n"
"If the format is known, pass the format to libguestfs, eg. using the\n"
@@ -9545,41 +9545,41 @@ msgstr ""
"параметра «--format» або за допомогою додаткового параметра аргументу "
"формату до «add-drive»."
-#: src/launch-libvirt.c:1847
+#: src/launch-libvirt.c:1848
msgid "could not define libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:1858
+#: src/launch-libvirt.c:1859
msgid "rbd protocol secret must be base64 encoded"
msgstr ""
-#: src/launch-libvirt.c:1862
+#: src/launch-libvirt.c:1863
#, c-format
msgid "base64_decode_alloc: %m"
msgstr ""
-#: src/launch-libvirt.c:1883
+#: src/launch-libvirt.c:1884
msgid "could not set libvirt secret value"
msgstr ""
-#: src/launch-libvirt.c:1896
+#: src/launch-libvirt.c:1897
msgid "could not get UUID from libvirt secret"
msgstr ""
-#: src/launch-libvirt.c:2003
+#: src/launch-libvirt.c:2004
msgid "could not destroy libvirt domain"
msgstr "не вдалося знищити домен libvirt"
-#: src/launch-libvirt.c:2054 src/launch-libvirt.c:2087
+#: src/launch-libvirt.c:2055 src/launch-libvirt.c:2088
#, c-format
msgid "%s: internal error forming error message"
msgstr "%s: внутрішня помилка формування повідомлення щодо помилки"
-#: src/launch-libvirt.c:2150
+#: src/launch-libvirt.c:2151
msgid "could not attach disk to libvirt domain"
msgstr "не вдалося долучити диск до домену libvirt"
-#: src/launch-libvirt.c:2181
+#: src/launch-libvirt.c:2182
msgid "could not detach disk from libvirt domain"
msgstr "не вдалося від’єднати диск від домену libvirt"
@@ -9975,8 +9975,8 @@ msgstr "libguestfs-test-tool: помилка guestfs_version\n"
#: test-tool/test-tool.c:154
#, c-format
-msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
-msgstr "libguestfs-test-tool: неочікуваний параметр командного рядка 0x%x\n"
+msgid "libguestfs-test-tool: unexpected command line option %d\n"
+msgstr ""
#: test-tool/test-tool.c:161
#, c-format
@@ -10181,6 +10181,24 @@ 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 "%s: empty --expand option"
+#~ msgstr "%s: порожній параметр --expand"
+
+#~ msgid "%s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: некоректний цілий параметр (%s повернуто %d)\n"
+
+#~ msgid "%s: %s: invalid integer parameter (%s returned %d)\n"
+#~ msgstr "%s: %s: некоректний цілий параметр (%s повернуто %d)\n"
+
+#~ msgid "%s: %s: invalid size parameter '%s' (%s returned %d)\n"
+#~ msgstr "%s: %s: некоректний параметр розміру «%s» (%s повернуто %d)\n"
+
+#~ msgid "security: cached appliance %s is not owned by UID %d"
+#~ msgstr "безпека: кешований пристрій %s не належить UID %d"
+
+#~ msgid "libguestfs-test-tool: unexpected command line option 0x%x\n"
+#~ msgstr "libguestfs-test-tool: неочікуваний параметр командного рядка 0x%x\n"
+
#~ msgid "Installing firstboot command: [%d] %s"
#~ msgstr "Встановлюємо програму firstboot: [%d] %s"
--
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