From 0ef30bbb316b50beba511a5eb4bd7174671fa1ca Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 9 Dec 2011 17:34:01 +0000
Subject: [PATCH] Version 1.15.11.

---
 BUGS                        | 16 +++++------
 configure.ac                |  2 +-
 po-docs/libguestfs-docs.pot |  4 +--
 po/en_GB.po                 | 56 +++++++++++++++++++++++++++---------
 po/es.po                    | 69 ++++++++++++++++++++++++++++++++++-----------
 po/gu.po                    | 61 +++++++++++++++++++++++++++++----------
 po/hi.po                    | 56 +++++++++++++++++++++++++++---------
 po/kn.po                    | 56 +++++++++++++++++++++++++++---------
 po/libguestfs.pot           | 58 +++++++++++++++++++++++++++----------
 po/ml.po                    | 56 +++++++++++++++++++++++++++---------
 po/mr.po                    | 67 ++++++++++++++++++++++++++++++++-----------
 po/nl.po                    | 68 +++++++++++++++++++++++++++++++++-----------
 po/or.po                    | 56 +++++++++++++++++++++++++++---------
 po/pa.po                    | 67 ++++++++++++++++++++++++++++++++-----------
 po/pl.po                    | 67 ++++++++++++++++++++++++++++++++-----------
 po/ta.po                    | 56 +++++++++++++++++++++++++++---------
 po/te.po                    | 56 +++++++++++++++++++++++++++---------
 po/uk.po                    | 69 ++++++++++++++++++++++++++++++++++-----------
 18 files changed, 703 insertions(+), 237 deletions(-)

diff --git a/BUGS b/BUGS
index 36e7fba..a1dc227 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
 NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2011-12-06
+Last updated: 2011-12-09
 
 This contains a local list of the bugs that are open against
 libguestfs.  Bugs are tracked in the Red Hat Bugzilla database
@@ -65,14 +65,11 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 760221 NEW https://bugzilla.redhat.com/show_bug.cgi?id=760221
   RFE: Support inspection of cciss devices
 
-760223 NEW https://bugzilla.redhat.com/show_bug.cgi?id=760223
-  RFE: Support inspection of MD devices
-
-760244 NEW https://bugzilla.redhat.com/show_bug.cgi?id=760244
-  RFE: Support inspection of cciss devices
+761565 NEW https://bugzilla.redhat.com/show_bug.cgi?id=761565
+  Missing deps on netpbm-progs and icoutils
 
-760245 NEW https://bugzilla.redhat.com/show_bug.cgi?id=760245
-  RFE: Support inspection of MD devices
+765814 NEW https://bugzilla.redhat.com/show_bug.cgi?id=765814
+  root can't access user mounted images
 
 563450 NEW https://bugzilla.redhat.com/show_bug.cgi?id=563450
   list-devices returns devices of different types out of order
@@ -189,6 +186,9 @@ You can help by testing the fixes.
 760000 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=760000
   libguestfs fails to compile with Ruby >= 1.9
 
+760245 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=760245
+  RFE: Support inspection of MD devices
+
 657499 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=657499
   checksum: wrong check sum type causes umount to fail
 
diff --git a/configure.ac b/configure.ac
index 130db51..28243a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 # freeform string.
 m4_define([libguestfs_major],   [1])
 m4_define([libguestfs_minor],   [15])
-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/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index 43c39ee..4b06ec0 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.15.10\n"
+"Project-Id-Version: libguestfs 1.15.11\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2011-12-06 15:09+0000\n"
+"POT-Creation-Date: 2011-12-09 17:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 933612e..ee8db09 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: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
 "PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
@@ -2160,35 +2160,35 @@ msgstr ""
 msgid "%s: %s: line %d: error parsing configuration file: %s\n"
 msgstr ""
 
-#: fish/copy.c:41
+#: fish/copy.c:46
 #, c-format
 msgid ""
 "use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
 msgstr ""
 
-#: fish/copy.c:62
+#: fish/copy.c:67
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:157
+#: fish/copy.c:164
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr ""
 
-#: fish/copy.c:202
+#: fish/copy.c:209
 #, c-format
 msgid ""
 "use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
 "image\n"
 msgstr ""
 
-#: fish/copy.c:213
+#: fish/copy.c:220
 #, c-format
 msgid "copy-out: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:258
+#: fish/copy.c:265
 #, c-format
 msgid "copy-out: '%s' is not a file or directory\n"
 msgstr ""
@@ -2460,27 +2460,55 @@ msgstr ""
 msgid "%s: don't use --live and -i options together\n"
 msgstr ""
 
-#: fish/inspect.c:89
+#: fish/inspect.c:90
 #, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:96
+#: fish/inspect.c:111
 #, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:136
+#: fish/inspect.c:170
 #, c-format
 msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr ""
 
-#: fish/inspect.c:148
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr ""
 
-#: fish/inspect.c:161
+#: fish/inspect.c:195
 #, c-format
 msgid "%s mounted on %s\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 7615d26..57aa9ed 100644
--- a/po/es.po
+++ b/po/es.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: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
 "PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Spanish (Castilian) <trans-es@lists.fedoraproject.org>\n"
@@ -2266,7 +2266,7 @@ msgstr "%s: comando desconocido\n"
 msgid "%s: %s: line %d: error parsing configuration file: %s\n"
 msgstr "%s: %s: linea %d: error al analizar el archivo de configuración: %s\n"
 
-#: fish/copy.c:41
+#: fish/copy.c:46
 #, c-format
 msgid ""
 "use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
@@ -2274,19 +2274,19 @@ msgstr ""
 "utilice el comando 'copy-in <local> [<local>...] <remotedir>' para copiar "
 "archivos dentro de la imagen\n"
 
-#: fish/copy.c:62
+#: fish/copy.c:67
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr "copy-in: el destino '%s' no es un directorio\n"
 
-#: fish/copy.c:157
+#: fish/copy.c:164
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr ""
 "error: la longitud del argumento es cero, o es mayor que la máxima "
 "permitida\n"
 
-#: fish/copy.c:202
+#: fish/copy.c:209
 #, c-format
 msgid ""
 "use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
@@ -2295,12 +2295,12 @@ msgstr ""
 "utilice el comando 'copy-out <remote> [<remote>...] <localdir>' para copiar "
 "archivos fuera de la imagen\n"
 
-#: fish/copy.c:213
+#: fish/copy.c:220
 #, c-format
 msgid "copy-out: target '%s' is not a directory\n"
 msgstr "copy-out: el destino '%s' no es un directorio\n"
 
-#: fish/copy.c:258
+#: fish/copy.c:265
 #, c-format
 msgid "copy-out: '%s' is not a file or directory\n"
 msgstr "copy-out: '%s' no es ni un archivo ni un directorio\n"
@@ -2664,31 +2664,57 @@ msgstr "hexedit: rango inválido\n"
 msgid "%s: don't use --live and -i options together\n"
 msgstr "%s: no utilice al mismo tiempo las opciones --live e -i\n"
 
-#: fish/inspect.c:89
+#: fish/inspect.c:90
 #, c-format
-msgid "%s: no operating system was found on this disk\n"
-msgstr "%s: no se ha encontrado un sistema operativo en este disco\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
 
-#: fish/inspect.c:96
+#: fish/inspect.c:111
 #, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
-"%s: los sistemas operativos de tipo multi arranque no tienen soporte con la "
-"opción -i\n"
 
-#: fish/inspect.c:136
+#: fish/inspect.c:170
 #, c-format
 msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr ""
 "%s: algunos sistemas de archivos no han podido ser montados (se han "
 "ignorado)\n"
 
-#: fish/inspect.c:148
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr "Sistema operativo: %s\n"
 
-#: fish/inspect.c:161
+#: fish/inspect.c:195
 #, c-format
 msgid "%s mounted on %s\n"
 msgstr "%s montado en %s\n"
@@ -4044,3 +4070,12 @@ 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: no operating system was found on this disk\n"
+#~ msgstr "%s: no se ha encontrado un sistema operativo en este disco\n"
+
+#~ msgid ""
+#~ "%s: multi-boot operating systems are not supported by the -i option\n"
+#~ msgstr ""
+#~ "%s: los sistemas operativos de tipo multi arranque no tienen soporte con "
+#~ "la opción -i\n"
diff --git a/po/gu.po b/po/gu.po
index 6cf99ca..0fe2a0b 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: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
 "PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Gujarati <trans-gu@lists.fedoraproject.org>\n"
@@ -2092,35 +2092,35 @@ msgstr "%s: અજ્ઞાત આદેશ\n"
 msgid "%s: %s: line %d: error parsing configuration file: %s\n"
 msgstr ""
 
-#: fish/copy.c:41
+#: fish/copy.c:46
 #, c-format
 msgid ""
 "use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
 msgstr ""
 
-#: fish/copy.c:62
+#: fish/copy.c:67
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:157
+#: fish/copy.c:164
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr ""
 
-#: fish/copy.c:202
+#: fish/copy.c:209
 #, c-format
 msgid ""
 "use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
 "image\n"
 msgstr ""
 
-#: fish/copy.c:213
+#: fish/copy.c:220
 #, c-format
 msgid "copy-out: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:258
+#: fish/copy.c:265
 #, c-format
 msgid "copy-out: '%s' is not a file or directory\n"
 msgstr ""
@@ -2397,27 +2397,55 @@ msgstr ""
 msgid "%s: don't use --live and -i options together\n"
 msgstr ""
 
-#: fish/inspect.c:89
+#: fish/inspect.c:90
 #, c-format
-msgid "%s: no operating system was found on this disk\n"
-msgstr "%s: ઓપરેટીંગ સિસ્ટમ આ ડિસ્ક પર મળી ન હતી\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
 
-#: fish/inspect.c:96
+#: fish/inspect.c:111
 #, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:136
+#: fish/inspect.c:170
 #, c-format
 msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr "%s: અમુક ફાઇલસિસ્ટમોને માઉન્ટ કરી શક્યા નહિં (અવગણેલ)\n"
 
-#: fish/inspect.c:148
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr "ઓપરેટીંગ સિસ્ટમ: %s\n"
 
-#: fish/inspect.c:161
+#: fish/inspect.c:195
 #, c-format
 msgid "%s mounted on %s\n"
 msgstr ""
@@ -3571,3 +3599,6 @@ msgstr ""
 #, perl-brace-format
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr ""
+
+#~ msgid "%s: no operating system was found on this disk\n"
+#~ msgstr "%s: ઓપરેટીંગ સિસ્ટમ આ ડિસ્ક પર મળી ન હતી\n"
diff --git a/po/hi.po b/po/hi.po
index 8898f23..2043d1c 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: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
 "PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -2091,35 +2091,35 @@ msgstr "%s: अज्ञात कमांड\n"
 msgid "%s: %s: line %d: error parsing configuration file: %s\n"
 msgstr ""
 
-#: fish/copy.c:41
+#: fish/copy.c:46
 #, c-format
 msgid ""
 "use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
 msgstr ""
 
-#: fish/copy.c:62
+#: fish/copy.c:67
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:157
+#: fish/copy.c:164
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr ""
 
-#: fish/copy.c:202
+#: fish/copy.c:209
 #, c-format
 msgid ""
 "use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
 "image\n"
 msgstr ""
 
-#: fish/copy.c:213
+#: fish/copy.c:220
 #, c-format
 msgid "copy-out: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:258
+#: fish/copy.c:265
 #, c-format
 msgid "copy-out: '%s' is not a file or directory\n"
 msgstr ""
@@ -2397,27 +2397,55 @@ msgstr ""
 msgid "%s: don't use --live and -i options together\n"
 msgstr ""
 
-#: fish/inspect.c:89
+#: fish/inspect.c:90
 #, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:96
+#: fish/inspect.c:111
 #, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:136
+#: fish/inspect.c:170
 #, c-format
 msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr ""
 
-#: fish/inspect.c:148
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr ""
 
-#: fish/inspect.c:161
+#: fish/inspect.c:195
 #, c-format
 msgid "%s mounted on %s\n"
 msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 1505bcf..2a1977f 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: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
 "PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Kannada (http://www.transifex.net/projects/p/fedora/team/"
@@ -2095,35 +2095,35 @@ msgstr ""
 msgid "%s: %s: line %d: error parsing configuration file: %s\n"
 msgstr ""
 
-#: fish/copy.c:41
+#: fish/copy.c:46
 #, c-format
 msgid ""
 "use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
 msgstr ""
 
-#: fish/copy.c:62
+#: fish/copy.c:67
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:157
+#: fish/copy.c:164
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr ""
 
-#: fish/copy.c:202
+#: fish/copy.c:209
 #, c-format
 msgid ""
 "use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
 "image\n"
 msgstr ""
 
-#: fish/copy.c:213
+#: fish/copy.c:220
 #, c-format
 msgid "copy-out: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:258
+#: fish/copy.c:265
 #, c-format
 msgid "copy-out: '%s' is not a file or directory\n"
 msgstr ""
@@ -2400,27 +2400,55 @@ msgstr ""
 msgid "%s: don't use --live and -i options together\n"
 msgstr ""
 
-#: fish/inspect.c:89
+#: fish/inspect.c:90
 #, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:96
+#: fish/inspect.c:111
 #, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:136
+#: fish/inspect.c:170
 #, c-format
 msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr ""
 
-#: fish/inspect.c:148
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr ""
 
-#: fish/inspect.c:161
+#: fish/inspect.c:195
 #, c-format
 msgid "%s mounted on %s\n"
 msgstr ""
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index b7bb092..5698188 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.15.10\n"
+"Project-Id-Version: libguestfs 1.15.11\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2087,35 +2087,35 @@ msgstr ""
 msgid "%s: %s: line %d: error parsing configuration file: %s\n"
 msgstr ""
 
-#: fish/copy.c:41
+#: fish/copy.c:46
 #, c-format
 msgid ""
 "use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
 msgstr ""
 
-#: fish/copy.c:62
+#: fish/copy.c:67
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:157
+#: fish/copy.c:164
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr ""
 
-#: fish/copy.c:202
+#: fish/copy.c:209
 #, c-format
 msgid ""
 "use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
 "image\n"
 msgstr ""
 
-#: fish/copy.c:213
+#: fish/copy.c:220
 #, c-format
 msgid "copy-out: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:258
+#: fish/copy.c:265
 #, c-format
 msgid "copy-out: '%s' is not a file or directory\n"
 msgstr ""
@@ -2387,27 +2387,55 @@ msgstr ""
 msgid "%s: don't use --live and -i options together\n"
 msgstr ""
 
-#: fish/inspect.c:89
+#: fish/inspect.c:90
 #, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:96
+#: fish/inspect.c:111
 #, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:136
+#: fish/inspect.c:170
 #, c-format
 msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr ""
 
-#: fish/inspect.c:148
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr ""
 
-#: fish/inspect.c:161
+#: fish/inspect.c:195
 #, c-format
 msgid "%s mounted on %s\n"
 msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 52ab697..1f00b8c 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: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
 "PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Malayalam <discuss@lists.smc.org.in>\n"
@@ -2093,35 +2093,35 @@ msgstr "%s: അപരിചിതമായ കമാന്‍ഡ്\n"
 msgid "%s: %s: line %d: error parsing configuration file: %s\n"
 msgstr ""
 
-#: fish/copy.c:41
+#: fish/copy.c:46
 #, c-format
 msgid ""
 "use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
 msgstr ""
 
-#: fish/copy.c:62
+#: fish/copy.c:67
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:157
+#: fish/copy.c:164
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr ""
 
-#: fish/copy.c:202
+#: fish/copy.c:209
 #, c-format
 msgid ""
 "use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
 "image\n"
 msgstr ""
 
-#: fish/copy.c:213
+#: fish/copy.c:220
 #, c-format
 msgid "copy-out: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:258
+#: fish/copy.c:265
 #, c-format
 msgid "copy-out: '%s' is not a file or directory\n"
 msgstr ""
@@ -2398,27 +2398,55 @@ msgstr ""
 msgid "%s: don't use --live and -i options together\n"
 msgstr ""
 
-#: fish/inspect.c:89
+#: fish/inspect.c:90
 #, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:96
+#: fish/inspect.c:111
 #, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:136
+#: fish/inspect.c:170
 #, c-format
 msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr ""
 
-#: fish/inspect.c:148
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr ""
 
-#: fish/inspect.c:161
+#: fish/inspect.c:195
 #, c-format
 msgid "%s mounted on %s\n"
 msgstr ""
diff --git a/po/mr.po b/po/mr.po
index c935e4e..fa91edf 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: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
 "PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Marathi (http://www.transifex.net/projects/p/fedora/team/"
@@ -2165,7 +2165,7 @@ msgstr "%s: अपरिचीत आदेश\n"
 msgid "%s: %s: line %d: error parsing configuration file: %s\n"
 msgstr ""
 
-#: fish/copy.c:41
+#: fish/copy.c:46
 #, c-format
 msgid ""
 "use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
@@ -2173,17 +2173,17 @@ msgstr ""
 "प्रतिमामध्ये फाइल्स्चे प्रत बनवण्यासाठी 'copy-in <local> [<local>...] <remotedir>' "
 "याचा वापर करा\n"
 
-#: fish/copy.c:62
+#: fish/copy.c:67
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr "copy-in: लक्ष्य '%s' डिरेक्ट्री नाही\n"
 
-#: fish/copy.c:157
+#: fish/copy.c:164
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr "त्रुटी: घटक झिरो लेंग्थ् किंवा स्वीकार्य कमालपेक्षा जास्त आहे\n"
 
-#: fish/copy.c:202
+#: fish/copy.c:209
 #, c-format
 msgid ""
 "use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
@@ -2192,12 +2192,12 @@ msgstr ""
 "प्रतिमेच्या बाहेर फाइल्चे प्रत निर्माण करण्यासाठी 'copy-out <remote> [<remote>...] "
 "<localdir>' वापर करा\n"
 
-#: fish/copy.c:213
+#: fish/copy.c:220
 #, c-format
 msgid "copy-out: target '%s' is not a directory\n"
 msgstr "copy-out: लक्ष्य '%s' डिरेक्ट्री नाही\n"
 
-#: fish/copy.c:258
+#: fish/copy.c:265
 #, c-format
 msgid "copy-out: '%s' is not a file or directory\n"
 msgstr "copy-out: '%s' फाइल किंवा डिरेक्ट्री नाही\n"
@@ -2499,27 +2499,55 @@ msgstr "hexedit: अवैध व्याप्ती\n"
 msgid "%s: don't use --live and -i options together\n"
 msgstr "%s: --live व -i पर्यायचा एकत्र वाप करू नका\n"
 
-#: fish/inspect.c:89
+#: fish/inspect.c:90
 #, c-format
-msgid "%s: no operating system was found on this disk\n"
-msgstr "%s: या डिस्कवर कार्यप्रणाली आढळली नाही\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
 
-#: fish/inspect.c:96
+#: fish/inspect.c:111
 #, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
-msgstr "%s: मल्टि-बूट कार्य प्रणाल्या -i पर्यायद्वारे समर्थीत नाही\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
 
-#: fish/inspect.c:136
+#: fish/inspect.c:170
 #, c-format
 msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr "%s: काहिक फाइलप्रणाली माऊंट करणे अशक्य (दुर्लक्ष केले)\n"
 
-#: fish/inspect.c:148
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr "कार्यप्रणाली: %s\n"
 
-#: fish/inspect.c:161
+#: fish/inspect.c:195
 #, c-format
 msgid "%s mounted on %s\n"
 msgstr "%s ला %s वर माऊंट केले\n"
@@ -3762,3 +3790,10 @@ 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: no operating system was found on this disk\n"
+#~ msgstr "%s: या डिस्कवर कार्यप्रणाली आढळली नाही\n"
+
+#~ msgid ""
+#~ "%s: multi-boot operating systems are not supported by the -i option\n"
+#~ msgstr "%s: मल्टि-बूट कार्य प्रणाल्या -i पर्यायद्वारे समर्थीत नाही\n"
diff --git a/po/nl.po b/po/nl.po
index 80d063d..c09d962 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: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
 "PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/fedora/team/nl/)\n"
@@ -2248,7 +2248,7 @@ msgstr "%s: onbekend commando\n"
 msgid "%s: %s: line %d: error parsing configuration file: %s\n"
 msgstr "%s: %s:regel %d: fout bij ontleden van configuratie bestand: %s\n"
 
-#: fish/copy.c:41
+#: fish/copy.c:46
 #, c-format
 msgid ""
 "use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
@@ -2256,17 +2256,17 @@ msgstr ""
 "gebruik 'copy-in <local> [<local>...] <remotedir>' om bestanden naar de "
 "image te kopieren\n"
 
-#: fish/copy.c:62
+#: fish/copy.c:67
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr "copy-in: doel '%s' is geen map\n"
 
-#: fish/copy.c:157
+#: fish/copy.c:164
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr "fout: argument heeft lengte nul of is langer dan toegestaan\n"
 
-#: fish/copy.c:202
+#: fish/copy.c:209
 #, c-format
 msgid ""
 "use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
@@ -2275,12 +2275,12 @@ msgstr ""
 "gebruik 'copy-out <remote> [<remote>...] <localdir>' om bestanden uit de "
 "image te kopieren\n"
 
-#: fish/copy.c:213
+#: fish/copy.c:220
 #, c-format
 msgid "copy-out: target '%s' is not a directory\n"
 msgstr "copy-out: doel '%s' is geen map\n"
 
-#: fish/copy.c:258
+#: fish/copy.c:265
 #, c-format
 msgid "copy-out: '%s' is not a file or directory\n"
 msgstr "copy-out: '%s' is geen bestand of map\n"
@@ -2641,29 +2641,56 @@ msgstr "hexedit: ongeldige reeks\n"
 msgid "%s: don't use --live and -i options together\n"
 msgstr "%s: gebruik --live en -i opties niet tezamen\n"
 
-#: fish/inspect.c:89
+#: fish/inspect.c:90
 #, c-format
-msgid "%s: no operating system was found on this disk\n"
-msgstr "%s: op deze schijf werd geen besturingssysteem gevonden\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
 
-#: fish/inspect.c:96
+#: fish/inspect.c:111
 #, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
-"%s: multi-boot besturingssystemen vorden niet ondersteund door de -i optie\n"
 
-#: fish/inspect.c:136
+#: fish/inspect.c:170
 #, c-format
 msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr ""
 "%s: sommige bestandssystemen konden niet aangekoppeld worden (genegeerd)\n"
 
-#: fish/inspect.c:148
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr "Besturingssysteem: %s\n"
 
-#: fish/inspect.c:161
+#: fish/inspect.c:195
 #, c-format
 msgid "%s mounted on %s\n"
 msgstr "%s aangekoppeld op %s\n"
@@ -3989,3 +4016,12 @@ msgstr "virt-win-reg: {p}: kon registry bestand niet downloaden: {err}\n"
 #, perl-brace-format
 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: no operating system was found on this disk\n"
+#~ msgstr "%s: op deze schijf werd geen besturingssysteem gevonden\n"
+
+#~ msgid ""
+#~ "%s: multi-boot operating systems are not supported by the -i option\n"
+#~ msgstr ""
+#~ "%s: multi-boot besturingssystemen vorden niet ondersteund door de -i "
+#~ "optie\n"
diff --git a/po/or.po b/po/or.po
index 99707ab..82935e6 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: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
 "PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Oriya (http://www.transifex.net/projects/p/fedora/team/or/)\n"
@@ -2091,35 +2091,35 @@ msgstr "%s: ଅଜଣା ନିର୍ଦ୍ଦେଶ\n"
 msgid "%s: %s: line %d: error parsing configuration file: %s\n"
 msgstr ""
 
-#: fish/copy.c:41
+#: fish/copy.c:46
 #, c-format
 msgid ""
 "use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
 msgstr ""
 
-#: fish/copy.c:62
+#: fish/copy.c:67
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:157
+#: fish/copy.c:164
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr ""
 
-#: fish/copy.c:202
+#: fish/copy.c:209
 #, c-format
 msgid ""
 "use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
 "image\n"
 msgstr ""
 
-#: fish/copy.c:213
+#: fish/copy.c:220
 #, c-format
 msgid "copy-out: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:258
+#: fish/copy.c:265
 #, c-format
 msgid "copy-out: '%s' is not a file or directory\n"
 msgstr ""
@@ -2397,27 +2397,55 @@ msgstr ""
 msgid "%s: don't use --live and -i options together\n"
 msgstr ""
 
-#: fish/inspect.c:89
+#: fish/inspect.c:90
 #, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:96
+#: fish/inspect.c:111
 #, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:136
+#: fish/inspect.c:170
 #, c-format
 msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr ""
 
-#: fish/inspect.c:148
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr ""
 
-#: fish/inspect.c:161
+#: fish/inspect.c:195
 #, c-format
 msgid "%s mounted on %s\n"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index cb3c573..f7bafe1 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: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
 "PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Panjabi (Punjabi) <punjabi-users@lists.sf.net>\n"
@@ -2163,24 +2163,24 @@ msgstr "%s: ਅਣਜਾਣ ਕਮਾਂਡ\n"
 msgid "%s: %s: line %d: error parsing configuration file: %s\n"
 msgstr ""
 
-#: fish/copy.c:41
+#: fish/copy.c:46
 #, c-format
 msgid ""
 "use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
 msgstr ""
 "ਫਾਇਲਾਂ ਨੂੰ ਈਮੇਜ਼ ਵਿੱਚ ਕਾਪੀ ਕਰਨ ਲਈ 'copy-in <local> [<local>...] <remotedir>' ਵਰਤੋ\n"
 
-#: fish/copy.c:62
+#: fish/copy.c:67
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr "copy-in: ਟਾਰਗਿਟ '%s' ਇੱਕ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਹੈ\n"
 
-#: fish/copy.c:157
+#: fish/copy.c:164
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr "ਗਲਤੀ: ਆਰਗੂਮੈਂਟ ਦੀ ਜ਼ੀਰੋ ਲੰਬਾਈ ਹੈ ਜਾਂ ਅਧਿਕਤਮ ਮਨਜੂਰ ਤੋਂ ਜਿਆਦਾ ਹੈ\n"
 
-#: fish/copy.c:202
+#: fish/copy.c:209
 #, c-format
 msgid ""
 "use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
@@ -2188,12 +2188,12 @@ msgid ""
 msgstr ""
 "ਈਮੇਜ਼ ਵਿੱਚ ਫਾਇਲਾਂ ਕਾਪੀ ਕਰਨ ਲਈ 'copy-out <remote> [<remote>...] <localdir>' ਵਰਤੋ\n"
 
-#: fish/copy.c:213
+#: fish/copy.c:220
 #, c-format
 msgid "copy-out: target '%s' is not a directory\n"
 msgstr "ਕਾਪੀ-ਆਊਟ: ਟਾਰਗਿਟ '%s' ਇੱਕ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਹੈ\n"
 
-#: fish/copy.c:258
+#: fish/copy.c:265
 #, c-format
 msgid "copy-out: '%s' is not a file or directory\n"
 msgstr "copy-out: '%s' ਇੱਕ ਫਾਇਲ ਜਾਂ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਹੈ\n"
@@ -2494,27 +2494,55 @@ msgstr "hexedit: ਯੋਗ ਰੇਂਜ\n"
 msgid "%s: don't use --live and -i options together\n"
 msgstr "%s: --live ਅਤੇ -i ਚੋਣਾਂ ਇਕੱਠੀਆਂ ਨਾ ਵਰਤੋ\n"
 
-#: fish/inspect.c:89
+#: fish/inspect.c:90
 #, c-format
-msgid "%s: no operating system was found on this disk\n"
-msgstr "%s: ਕੋਈ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ ਇਸ ਡਿਸਕ ਤੇ ਨਹੀਂ ਲੱਭਿਆ\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
 
-#: fish/inspect.c:96
+#: fish/inspect.c:111
 #, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
-msgstr "%s: ਮਲਟੀ-ਬੂਟ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ -i ਚੋਣ ਦੁਆਰਾ ਸਹਿਯੋਗ ਨਹੀਂ ਹੈ\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
 
-#: fish/inspect.c:136
+#: fish/inspect.c:170
 #, c-format
 msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr "%s: ਕੁਝ ਫਾਇਲ ਸਿਸਟਮ ਮਾਊਂਟ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ (ਰੱਦ ਕੀਤੇ ਗਏ ਹਨ)\n"
 
-#: fish/inspect.c:148
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr "ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ: %s\n"
 
-#: fish/inspect.c:161
+#: fish/inspect.c:195
 #, c-format
 msgid "%s mounted on %s\n"
 msgstr "%s ਨੂੰ %s ਉੱਪਰ ਮਾਊਂਟ ਕੀਤਾ ਗਿਆ ਹੈ\n"
@@ -3760,3 +3788,10 @@ 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: no operating system was found on this disk\n"
+#~ msgstr "%s: ਕੋਈ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ ਇਸ ਡਿਸਕ ਤੇ ਨਹੀਂ ਲੱਭਿਆ\n"
+
+#~ msgid ""
+#~ "%s: multi-boot operating systems are not supported by the -i option\n"
+#~ msgstr "%s: ਮਲਟੀ-ਬੂਟ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ -i ਚੋਣ ਦੁਆਰਾ ਸਹਿਯੋਗ ਨਹੀਂ ਹੈ\n"
diff --git a/po/pl.po b/po/pl.po
index a105336..f02632e 100644
--- a/po/pl.po
+++ b/po/pl.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: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
 "PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/fedora/team/pl/)\n"
@@ -2259,7 +2259,7 @@ msgstr "%s: nieznane polecenie\n"
 msgid "%s: %s: line %d: error parsing configuration file: %s\n"
 msgstr "%s: %s: wiersz %d: błąd podczas przetwarzania pliku konfiguracji: %s\n"
 
-#: fish/copy.c:41
+#: fish/copy.c:46
 #, c-format
 msgid ""
 "use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
@@ -2267,18 +2267,18 @@ msgstr ""
 "należy użyć \"copy-in <lokalny> [<lokalny>...] <zdalny_katalog>\", aby "
 "skopiować pliki do obrazu\n"
 
-#: fish/copy.c:62
+#: fish/copy.c:67
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr "copy-in: cel \"%s\" nie jest katalogiem\n"
 
-#: fish/copy.c:157
+#: fish/copy.c:164
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr ""
 "błąd: parametr jest zerowej długości lub dłuższy niż dozwolone maksimum\n"
 
-#: fish/copy.c:202
+#: fish/copy.c:209
 #, c-format
 msgid ""
 "use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
@@ -2287,12 +2287,12 @@ msgstr ""
 "należy użyć \"copy-out <zdalny> [<zdalny>...] <lokalny_katalog>\", aby "
 "skopiować pliki z obrazu\n"
 
-#: fish/copy.c:213
+#: fish/copy.c:220
 #, c-format
 msgid "copy-out: target '%s' is not a directory\n"
 msgstr "copy-out: element docelowy \"%s\" nie jest katalogiem\n"
 
-#: fish/copy.c:258
+#: fish/copy.c:265
 #, c-format
 msgid "copy-out: '%s' is not a file or directory\n"
 msgstr "copy-out: \"%s\" nie jest plikiem lub katalogiem\n"
@@ -2654,28 +2654,55 @@ msgstr "hexedit: nieprawidłowy zakres\n"
 msgid "%s: don't use --live and -i options together\n"
 msgstr "%s: nie należy używać razem opcji --live i -i\n"
 
-#: fish/inspect.c:89
+#: fish/inspect.c:90
 #, c-format
-msgid "%s: no operating system was found on this disk\n"
-msgstr "%s: na tym dysku nie odnaleziono żadnych systemów operacyjnych\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
 
-#: fish/inspect.c:96
+#: fish/inspect.c:111
 #, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
-"%s: systemy operacyjne \"multiboot\" nie są obsługiwane przez opcję -i\n"
 
-#: fish/inspect.c:136
+#: fish/inspect.c:170
 #, c-format
 msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr "%s: nie można zamontować niektórych systemów plików (zignorowano)\n"
 
-#: fish/inspect.c:148
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr "System operacyjny: %s\n"
 
-#: fish/inspect.c:161
+#: fish/inspect.c:195
 #, c-format
 msgid "%s mounted on %s\n"
 msgstr "%s zamontowano w %s\n"
@@ -4025,3 +4052,11 @@ msgstr "virt-win-reg: {p}: nie można pobrać pliku rejestru: {err}\n"
 #, perl-brace-format
 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: no operating system was found on this disk\n"
+#~ msgstr "%s: na tym dysku nie odnaleziono żadnych systemów operacyjnych\n"
+
+#~ msgid ""
+#~ "%s: multi-boot operating systems are not supported by the -i option\n"
+#~ msgstr ""
+#~ "%s: systemy operacyjne \"multiboot\" nie są obsługiwane przez opcję -i\n"
diff --git a/po/ta.po b/po/ta.po
index bf8586a..e962198 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: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
 "PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Tamil <tamil-users@lists.fedoraproject.org>\n"
@@ -2091,35 +2091,35 @@ msgstr "%s: தெரியாத கட்டளை\n"
 msgid "%s: %s: line %d: error parsing configuration file: %s\n"
 msgstr ""
 
-#: fish/copy.c:41
+#: fish/copy.c:46
 #, c-format
 msgid ""
 "use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
 msgstr ""
 
-#: fish/copy.c:62
+#: fish/copy.c:67
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:157
+#: fish/copy.c:164
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr ""
 
-#: fish/copy.c:202
+#: fish/copy.c:209
 #, c-format
 msgid ""
 "use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
 "image\n"
 msgstr ""
 
-#: fish/copy.c:213
+#: fish/copy.c:220
 #, c-format
 msgid "copy-out: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:258
+#: fish/copy.c:265
 #, c-format
 msgid "copy-out: '%s' is not a file or directory\n"
 msgstr ""
@@ -2397,27 +2397,55 @@ msgstr ""
 msgid "%s: don't use --live and -i options together\n"
 msgstr ""
 
-#: fish/inspect.c:89
+#: fish/inspect.c:90
 #, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:96
+#: fish/inspect.c:111
 #, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:136
+#: fish/inspect.c:170
 #, c-format
 msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr ""
 
-#: fish/inspect.c:148
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr ""
 
-#: fish/inspect.c:161
+#: fish/inspect.c:195
 #, c-format
 msgid "%s mounted on %s\n"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 8b6f44e..dd28b3a 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: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
 "PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Telugu (http://www.transifex.net/projects/p/fedora/team/te/)\n"
@@ -2090,35 +2090,35 @@ msgstr "%s: తెలియని ఆదేశము\n"
 msgid "%s: %s: line %d: error parsing configuration file: %s\n"
 msgstr ""
 
-#: fish/copy.c:41
+#: fish/copy.c:46
 #, c-format
 msgid ""
 "use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
 msgstr ""
 
-#: fish/copy.c:62
+#: fish/copy.c:67
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:157
+#: fish/copy.c:164
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr ""
 
-#: fish/copy.c:202
+#: fish/copy.c:209
 #, c-format
 msgid ""
 "use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
 "image\n"
 msgstr ""
 
-#: fish/copy.c:213
+#: fish/copy.c:220
 #, c-format
 msgid "copy-out: target '%s' is not a directory\n"
 msgstr ""
 
-#: fish/copy.c:258
+#: fish/copy.c:265
 #, c-format
 msgid "copy-out: '%s' is not a file or directory\n"
 msgstr ""
@@ -2395,27 +2395,55 @@ msgstr ""
 msgid "%s: don't use --live and -i options together\n"
 msgstr ""
 
-#: fish/inspect.c:89
+#: fish/inspect.c:90
 #, c-format
-msgid "%s: no operating system was found on this disk\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:96
+#: fish/inspect.c:111
 #, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
 
-#: fish/inspect.c:136
+#: fish/inspect.c:170
 #, c-format
 msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr ""
 
-#: fish/inspect.c:148
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr ""
 
-#: fish/inspect.c:161
+#: fish/inspect.c:195
 #, c-format
 msgid "%s mounted on %s\n"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 300f688..62e38a0 100644
--- a/po/uk.po
+++ b/po/uk.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: 2011-12-06 15:08+0000\n"
+"POT-Creation-Date: 2011-12-09 17:32+0000\n"
 "PO-Revision-Date: 2011-10-27 09:11+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
@@ -2288,7 +2288,7 @@ msgid "%s: %s: line %d: error parsing configuration file: %s\n"
 msgstr ""
 "%s: %s: рядок %d: помилка під час спроби обробки файла налаштувань: %s\n"
 
-#: fish/copy.c:41
+#: fish/copy.c:46
 #, c-format
 msgid ""
 "use 'copy-in <local> [<local>...] <remotedir>' to copy files into the image\n"
@@ -2296,18 +2296,18 @@ msgstr ""
 "скористайтеся командою «copy-in <локальний файл> [<локальний файл>...] "
 "<віддалений каталог>» для копіювання файлів на образ\n"
 
-#: fish/copy.c:62
+#: fish/copy.c:67
 #, c-format
 msgid "copy-in: target '%s' is not a directory\n"
 msgstr "copy-in: призначення «%s» не є каталогом\n"
 
-#: fish/copy.c:157
+#: fish/copy.c:164
 #, c-format
 msgid "error: argument is zero length or longer than maximum permitted\n"
 msgstr ""
 "помилка: аргумент нульової або вищої за максимальну дозволену довжини\n"
 
-#: fish/copy.c:202
+#: fish/copy.c:209
 #, c-format
 msgid ""
 "use 'copy-out <remote> [<remote>...] <localdir>' to copy files out of the "
@@ -2316,12 +2316,12 @@ msgstr ""
 "скористайтеся командою «copy-out <віддалений файл> [<віддалений файл>...] "
 "<локальний каталог>» для копіювання файлів з образу\n"
 
-#: fish/copy.c:213
+#: fish/copy.c:220
 #, c-format
 msgid "copy-out: target '%s' is not a directory\n"
 msgstr "copy-out: призначення «%s» не є каталогом\n"
 
-#: fish/copy.c:258
+#: fish/copy.c:265
 #, c-format
 msgid "copy-out: '%s' is not a file or directory\n"
 msgstr "copy-out: «%s» не є файлом або каталогом\n"
@@ -2689,29 +2689,55 @@ msgstr "hexedit: некоректний діапазон\n"
 msgid "%s: don't use --live and -i options together\n"
 msgstr "%s: не використовуйте одразу параметри --live і -i\n"
 
-#: fish/inspect.c:89
+#: fish/inspect.c:90
 #, c-format
-msgid "%s: no operating system was found on this disk\n"
-msgstr "%s: на цьому диску не виявлено операційної системи\n"
+msgid ""
+"%s: no operating system was found on this disk\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, this disk image won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
+msgstr ""
 
-#: fish/inspect.c:96
+#: fish/inspect.c:111
 #, c-format
-msgid "%s: multi-boot operating systems are not supported by the -i option\n"
+msgid ""
+"%s: multi-boot operating systems are not supported\n"
+"\n"
+"If using guestfish '-i' option, remove this option and instead\n"
+"use the commands 'run' followed by 'list-filesystems'.\n"
+"You can then mount filesystems you want by hand using the\n"
+"'mount' or 'mount-ro' command.\n"
+"\n"
+"If using guestmount '-i', remove this option and choose the\n"
+"filesystem(s) you want to see by manually adding '-m' option(s).\n"
+"Use 'virt-filesystems' to see what filesystems are available.\n"
+"\n"
+"If using other virt tools, multi-boot operating systems won't work\n"
+"with these tools.  Use the guestfish equivalent commands\n"
+"(see the virt tool manual page).\n"
 msgstr ""
-"%s: для параметра -i не передбачено підтримки операційних систем з "
-"варіантами завантаження\n"
 
-#: fish/inspect.c:136
+#: fish/inspect.c:170
 #, c-format
 msgid "%s: some filesystems could not be mounted (ignored)\n"
 msgstr "%s: деякі з файлових систем не вдалося змонтувати (проігноровано)\n"
 
-#: fish/inspect.c:148
+#: fish/inspect.c:182
 #, c-format
 msgid "Operating system: %s\n"
 msgstr "Операційна система: %s\n"
 
-#: fish/inspect.c:161
+#: fish/inspect.c:195
 #, c-format
 msgid "%s mounted on %s\n"
 msgstr "%s змонтовано до %s\n"
@@ -4070,3 +4096,12 @@ 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: no operating system was found on this disk\n"
+#~ msgstr "%s: на цьому диску не виявлено операційної системи\n"
+
+#~ msgid ""
+#~ "%s: multi-boot operating systems are not supported by the -i option\n"
+#~ msgstr ""
+#~ "%s: для параметра -i не передбачено підтримки операційних систем з "
+#~ "варіантами завантаження\n"
-- 
1.8.3.1