po: merge changes

Signed-off-by: Karel Zak <kzak@redhat.com>

1 files changed, 24 insertions, 16 deletions

diff --git a/po/ca.po b/po/ca.po
index e2f1109bb..17942f898 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre3\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2008-04-28 14:00+0200\n"
+"POT-Creation-Date: 2008-05-19 10:56+0200\n"
 "PO-Revision-Date: 2005-09-17 13:40+0200\n"
 "Last-Translator: Josep Puigdemont <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -3924,7 +3924,7 @@ msgstr "SunOS home"
 msgid "SunOS reserved"
 msgstr "SunOS usr"
 
-#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:100
+#: fdisk/fdisksunlabel.c:58 fdisk/i386_sys_types.c:102
 msgid "Linux raid autodetect"
 msgstr "Autodetecció RAID Linux"
 
@@ -4457,11 +4457,19 @@ msgstr "Arrencada Linux/PA-RISC"
 msgid "DOS secondary"
 msgstr "Secundària DOS"
 
-#: fdisk/i386_sys_types.c:103
+#: fdisk/i386_sys_types.c:100
+msgid "VMware VMFS"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:101
+msgid "VMware VMKCORE"
+msgstr ""
+
+#: fdisk/i386_sys_types.c:105
 msgid "LANstep"
 msgstr "LANstep"
 
-#: fdisk/i386_sys_types.c:104
+#: fdisk/i386_sys_types.c:106
 msgid "BBT"
 msgstr "BBT"
 
@@ -7907,27 +7915,27 @@ msgstr ""
 "No s'ha pogut crear l'enllaç %s\n"
 "Potser hi ha un fitxer de blocat obsolet?\n"
 
-#: mount/fstab.c:703 mount/fstab.c:756
+#: mount/fstab.c:785 mount/fstab.c:840
 #, c-format
 msgid "cannot open %s (%s) - mtab not updated"
 msgstr "no s'ha pogut obrir %s (%s) - no s'ha actualitzat mtab"
 
-#: mount/fstab.c:765
+#: mount/fstab.c:849
 #, c-format
 msgid "error writing %s: %s"
 msgstr "s'ha produït un error en escriure %s: %s"
 
-#: mount/fstab.c:783
+#: mount/fstab.c:867
 #, c-format
 msgid "error changing mode of %s: %s\n"
 msgstr "s'ha produït un error en canviar el mode de %s: %s\n"
 
-#: mount/fstab.c:796
+#: mount/fstab.c:880
 #, fuzzy, c-format
 msgid "error changing owner of %s: %s\n"
 msgstr "s'ha produït un error en canviar el mode de %s: %s\n"
 
-#: mount/fstab.c:807
+#: mount/fstab.c:891
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr "no s'ha pogut tornar a nomenar %s per %s: %s\n"
@@ -9940,7 +9948,7 @@ msgstr ""
 msgid "Switching on %s.\n"
 msgstr ""
 
-#: sys-utils/setarch.c:81
+#: sys-utils/setarch.c:113
 #, c-format
 msgid ""
 "Usage: %s%s [options] [program [program arguments]]\n"
@@ -9948,7 +9956,7 @@ msgid ""
 "Options:\n"
 msgstr ""
 
-#: sys-utils/setarch.c:85
+#: sys-utils/setarch.c:117
 #, c-format
 msgid ""
 " -h, --help               displays this help text\n"
@@ -9968,31 +9976,31 @@ msgid ""
 "     --4gb                ignored (for backward compatibility only)\n"
 msgstr ""
 
-#: sys-utils/setarch.c:99
+#: sys-utils/setarch.c:131
 #, c-format
 msgid ""
 "\n"
 "For more information see setarch(8).\n"
 msgstr ""
 
-#: sys-utils/setarch.c:111
+#: sys-utils/setarch.c:143
 #, fuzzy, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
 msgstr "Escolliu `getopt --help' per obtenir més informació.\n"
 
-#: sys-utils/setarch.c:183 sys-utils/setarch.c:199
+#: sys-utils/setarch.c:215 sys-utils/setarch.c:231
 #, fuzzy, c-format
 msgid "%s: Unrecognized architecture"
 msgstr " %s: no s'ha pogut reconèixer el tipus de la taula de particions\n"
 
-#: sys-utils/setarch.c:217 sys-utils/setarch.c:224
+#: sys-utils/setarch.c:249 sys-utils/setarch.c:256
 #, fuzzy
 msgid "Not enough arguments"
 msgstr "Massa arguments.\n"
 
-#: sys-utils/setarch.c:233 sys-utils/setarch.c:286
+#: sys-utils/setarch.c:265 sys-utils/setarch.c:318
 #, fuzzy, c-format
 msgid "Failed to set personality to %s"
 msgstr "No s'ha pogut escriure la partició a %s\n"