diff -Nru /tmp/08fbspLcCq/evms-2.5.5/debian/80-evms.rules /tmp/OsUcCqtjNH/evms-2.5.5/debian/80-evms.rules --- /tmp/08fbspLcCq/evms-2.5.5/debian/80-evms.rules 2007-04-03 16:28:30.000000000 +0100 +++ /tmp/OsUcCqtjNH/evms-2.5.5/debian/80-evms.rules 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_FS_USAGE}=="raid", GOTO="evms_activate_do" -SUBSYSTEM=="block", ACTION=="add|change", KERNEL=="dm-*", GOTO="evms_activate_do" -GOTO="evms_activate_end" - -LABEL="evms_activate_do" -RUN+="watershed /sbin/evms_activate" - -LABEL="evms_activate_end" diff -Nru /tmp/08fbspLcCq/evms-2.5.5/debian/85-evms.rules /tmp/OsUcCqtjNH/evms-2.5.5/debian/85-evms.rules --- /tmp/08fbspLcCq/evms-2.5.5/debian/85-evms.rules 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/OsUcCqtjNH/evms-2.5.5/debian/85-evms.rules 2007-04-03 16:28:30.000000000 +0100 @@ -0,0 +1,8 @@ +SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_FS_USAGE}=="raid", GOTO="evms_activate_do" +SUBSYSTEM=="block", ACTION=="add|change", KERNEL=="dm-*", GOTO="evms_activate_do" +GOTO="evms_activate_end" + +LABEL="evms_activate_do" +RUN+="watershed /sbin/evms_activate" + +LABEL="evms_activate_end" diff -Nru /tmp/08fbspLcCq/evms-2.5.5/debian/changelog /tmp/OsUcCqtjNH/evms-2.5.5/debian/changelog --- /tmp/08fbspLcCq/evms-2.5.5/debian/changelog 2007-04-03 16:32:46.000000000 +0100 +++ /tmp/OsUcCqtjNH/evms-2.5.5/debian/changelog 2007-04-10 09:19:09.000000000 +0100 @@ -1,3 +1,10 @@ +evms (2.5.5-18ubuntu4) feisty; urgency=low + + * Install evms udev rules into the initramfs. LP: #74317. + * Rename evms udev rules to 85-evms.rules + + -- Scott James Remnant Tue, 10 Apr 2007 09:19:02 +0100 + evms (2.5.5-18ubuntu3) feisty; urgency=low * Rename 70-evms.rules to 80-evms.rules, and react to block device changes diff -Nru /tmp/08fbspLcCq/evms-2.5.5/debian/evms.preinst /tmp/OsUcCqtjNH/evms-2.5.5/debian/evms.preinst --- /tmp/08fbspLcCq/evms-2.5.5/debian/evms.preinst 2007-04-03 16:28:14.000000000 +0100 +++ /tmp/OsUcCqtjNH/evms-2.5.5/debian/evms.preinst 2007-04-10 09:19:00.000000000 +0100 @@ -5,6 +5,9 @@ if [ -f /etc/udev/rules.d/70-evms.rules ]; then rm -f /etc/udev/rules.d/70-evms.rules fi + if [ -f /etc/udev/rules.d/80-evms.rules ]; then + rm -f /etc/udev/rules.d/80-evms.rules + fi ;; esac diff -Nru /tmp/08fbspLcCq/evms-2.5.5/debian/hooks_evms /tmp/OsUcCqtjNH/evms-2.5.5/debian/hooks_evms --- /tmp/08fbspLcCq/evms-2.5.5/debian/hooks_evms 2006-12-08 17:15:55.000000000 +0000 +++ /tmp/OsUcCqtjNH/evms-2.5.5/debian/hooks_evms 2007-04-10 09:23:48.000000000 +0100 @@ -23,6 +23,10 @@ copy_exec /sbin/evms_activate /sbin cp /etc/evms.conf ${DESTDIR}/etc +rulesdir=/etc/udev/rules.d +mkdir -p $DESTDIR/$rulesdir +cp $rulesdir/*-evms.rules $DESTDIR/$rulesdir + # # This is a workaround that will do until EVMS stops segfaulting on close, not emptying # its stdout buffer. diff -Nru /tmp/08fbspLcCq/evms-2.5.5/debian/rules /tmp/OsUcCqtjNH/evms-2.5.5/debian/rules --- /tmp/08fbspLcCq/evms-2.5.5/debian/rules 2007-04-03 16:28:44.000000000 +0100 +++ /tmp/OsUcCqtjNH/evms-2.5.5/debian/rules 2007-04-10 09:18:18.000000000 +0100 @@ -94,7 +94,7 @@ done install -m755 -d debian/evms/etc/udev/rules.d - install -m644 -oroot -groot debian/80-evms.rules \ + install -m644 -oroot -groot debian/85-evms.rules \ debian/evms/etc/udev/rules.d/. install -m 644 debian/evms.devfs $(CURDIR)/debian/evms/etc/devfs/conf.d/evms diff -Nru /tmp/08fbspLcCq/evms-2.5.5/po/en@boldquot.po /tmp/OsUcCqtjNH/evms-2.5.5/po/en@boldquot.po --- /tmp/08fbspLcCq/evms-2.5.5/po/en@boldquot.po 2006-12-08 17:15:55.000000000 +0000 +++ /tmp/OsUcCqtjNH/evms-2.5.5/po/en@boldquot.po 2007-04-10 09:16:36.000000000 +0100 @@ -32,7 +32,7 @@ msgstr "" "Project-Id-Version: EVMS 2.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-02 17:01+0200\n" +"POT-Creation-Date: 2007-04-10 09:16+0100\n" "PO-Revision-Date: 2004-09-17 11:45-0500\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -1144,7 +1144,7 @@ #: plugins/lvm2/lvm2.c:1092 plugins/mac/options.c:176 #: plugins/md/linear_mgr.c:1824 plugins/md/multipath.c:1975 #: plugins/md/raid0_mgr.c:3221 plugins/md/raid1_mgr.c:2576 -#: plugins/md/raid5_mgr.c:4474 plugins/ntfs/ntfsfsim.c:1454 +#: plugins/md/raid5_mgr.c:4470 plugins/ntfs/ntfsfsim.c:1454 #: plugins/ocfs2/ocfs2.c:1696 plugins/ocfs2/ocfs2.c:1697 #: plugins/ogfs/fs_ogfs.c:2985 plugins/reiser/reiserfs.c:1657 #: plugins/replace/replace.c:1533 plugins/rsct/rsct_ece.c:981 @@ -1162,7 +1162,7 @@ #: plugins/lvm2/lvm2.c:1093 plugins/mac/options.c:177 #: plugins/md/linear_mgr.c:1825 plugins/md/multipath.c:1976 #: plugins/md/raid0_mgr.c:3222 plugins/md/raid1_mgr.c:2577 -#: plugins/md/raid5_mgr.c:4475 plugins/ntfs/ntfsfsim.c:1455 +#: plugins/md/raid5_mgr.c:4471 plugins/ntfs/ntfsfsim.c:1455 #: plugins/ogfs/fs_ogfs.c:2986 plugins/reiser/reiserfs.c:1658 #: plugins/replace/replace.c:1534 plugins/rsct/rsct_ece.c:982 #: plugins/s390/options.c:2325 plugins/snapshot/snapshot.c:1125 @@ -1179,7 +1179,7 @@ #: plugins/lvm2/lvm2.c:1100 plugins/mac/options.c:185 #: plugins/md/linear_mgr.c:1832 plugins/md/multipath.c:1983 #: plugins/md/raid0_mgr.c:3229 plugins/md/raid1_mgr.c:2584 -#: plugins/md/raid5_mgr.c:4481 plugins/ntfs/ntfsfsim.c:1463 +#: plugins/md/raid5_mgr.c:4477 plugins/ntfs/ntfsfsim.c:1463 #: plugins/ocfs2/ocfs2.c:1702 plugins/ocfs2/ocfs2.c:1703 #: plugins/ogfs/fs_ogfs.c:2994 plugins/reiser/reiserfs.c:1666 #: plugins/replace/replace.c:1540 plugins/rsct/rsct_ece.c:988 @@ -1197,7 +1197,7 @@ #: plugins/lvm2/lvm2.c:1101 plugins/mac/options.c:186 #: plugins/md/linear_mgr.c:1833 plugins/md/multipath.c:1984 #: plugins/md/raid0_mgr.c:3230 plugins/md/raid1_mgr.c:2585 -#: plugins/md/raid5_mgr.c:4482 plugins/ntfs/ntfsfsim.c:1464 +#: plugins/md/raid5_mgr.c:4478 plugins/ntfs/ntfsfsim.c:1464 #: plugins/ogfs/fs_ogfs.c:2995 plugins/reiser/reiserfs.c:1667 #: plugins/replace/replace.c:1541 plugins/rsct/rsct_ece.c:989 #: plugins/s390/options.c:2334 plugins/snapshot/snapshot.c:1133 @@ -1213,7 +1213,7 @@ #: plugins/jfs/fs_jfs.c:1733 plugins/lvm/lvmregmgr.c:1268 #: plugins/mac/options.c:194 plugins/md/linear_mgr.c:1840 #: plugins/md/multipath.c:1991 plugins/md/raid0_mgr.c:3237 -#: plugins/md/raid1_mgr.c:2592 plugins/md/raid5_mgr.c:4488 +#: plugins/md/raid1_mgr.c:2592 plugins/md/raid5_mgr.c:4484 #: plugins/ntfs/ntfsfsim.c:1472 plugins/ogfs/fs_ogfs.c:3003 #: plugins/reiser/reiserfs.c:1675 plugins/replace/replace.c:1547 #: plugins/rsct/rsct_ece.c:995 plugins/s390/options.c:2342 @@ -1231,7 +1231,7 @@ #: plugins/lvm2/lvm2.c:1109 plugins/mac/options.c:195 #: plugins/md/linear_mgr.c:1841 plugins/md/multipath.c:1992 #: plugins/md/raid0_mgr.c:3238 plugins/md/raid1_mgr.c:2593 -#: plugins/md/raid5_mgr.c:4489 plugins/ntfs/ntfsfsim.c:1473 +#: plugins/md/raid5_mgr.c:4485 plugins/ntfs/ntfsfsim.c:1473 #: plugins/ogfs/fs_ogfs.c:3004 plugins/reiser/reiserfs.c:1676 #: plugins/replace/replace.c:1548 plugins/s390/options.c:2343 #: plugins/snapshot/snapshot.c:1141 plugins/swap/swapfs.c:960 @@ -1255,7 +1255,7 @@ #: plugins/lvm/lvmregmgr.c:1276 plugins/mac/options.c:203 #: plugins/md/linear_mgr.c:1848 plugins/md/multipath.c:1999 #: plugins/md/raid0_mgr.c:3245 plugins/md/raid1_mgr.c:2600 -#: plugins/md/raid5_mgr.c:4495 plugins/ntfs/ntfsfsim.c:1481 +#: plugins/md/raid5_mgr.c:4491 plugins/ntfs/ntfsfsim.c:1481 #: plugins/ogfs/fs_ogfs.c:3012 plugins/reiser/reiserfs.c:1684 #: plugins/replace/replace.c:1554 plugins/rsct/rsct_ece.c:1003 #: plugins/s390/options.c:2351 plugins/snapshot/snapshot.c:1148 @@ -1268,7 +1268,7 @@ #: plugins/fat/fatfsim.c:984 plugins/ha/ece.c:2412 plugins/jfs/fs_jfs.c:1743 #: plugins/lvm/lvmregmgr.c:1277 plugins/md/linear_mgr.c:1849 #: plugins/md/multipath.c:2000 plugins/md/raid0_mgr.c:3246 -#: plugins/md/raid1_mgr.c:2601 plugins/md/raid5_mgr.c:4496 +#: plugins/md/raid1_mgr.c:2601 plugins/md/raid5_mgr.c:4492 #: plugins/ntfs/ntfsfsim.c:1482 plugins/ogfs/fs_ogfs.c:3013 #: plugins/reiser/reiserfs.c:1685 plugins/replace/replace.c:1555 #: plugins/rsct/rsct_ece.c:1005 plugins/snapshot/snapshot.c:1149 @@ -1284,7 +1284,7 @@ #: plugins/lvm/lvmregmgr.c:1286 plugins/lvm2/lvm2.c:1132 #: plugins/mac/options.c:212 plugins/md/linear_mgr.c:1857 #: plugins/md/multipath.c:2008 plugins/md/raid0_mgr.c:3254 -#: plugins/md/raid1_mgr.c:2609 plugins/md/raid5_mgr.c:4504 +#: plugins/md/raid1_mgr.c:2609 plugins/md/raid5_mgr.c:4500 #: plugins/ntfs/ntfsfsim.c:1490 plugins/ocfs2/ocfs2.c:1720 #: plugins/ocfs2/ocfs2.c:1721 plugins/ogfs/fs_ogfs.c:3021 #: plugins/reiser/reiserfs.c:1693 plugins/replace/replace.c:1562 @@ -1300,7 +1300,7 @@ #: plugins/jfs/fs_jfs.c:1752 plugins/lvm/lvmregmgr.c:1287 #: plugins/md/linear_mgr.c:1858 plugins/md/multipath.c:2009 #: plugins/md/raid0_mgr.c:3255 plugins/md/raid1_mgr.c:2610 -#: plugins/md/raid5_mgr.c:4505 plugins/ntfs/ntfsfsim.c:1491 +#: plugins/md/raid5_mgr.c:4501 plugins/ntfs/ntfsfsim.c:1491 #: plugins/ocfs2/ocfs2.c:1722 plugins/ogfs/fs_ogfs.c:3022 #: plugins/reiser/reiserfs.c:1694 plugins/replace/replace.c:1563 #: plugins/rsct/rsct_ece.c:1015 plugins/snapshot/snapshot.c:1161 @@ -1322,7 +1322,7 @@ #: plugins/bbr/bbroptions.c:588 plugins/dos/segoptions.c:3319 #: plugins/lvm/lvmregmgr.c:1300 plugins/md/linear_mgr.c:1868 #: plugins/md/multipath.c:2022 plugins/md/raid0_mgr.c:3265 -#: plugins/md/raid1_mgr.c:2620 plugins/md/raid5_mgr.c:4515 +#: plugins/md/raid1_mgr.c:2620 plugins/md/raid5_mgr.c:4511 #: plugins/replace/replace.c:1572 plugins/snapshot/snapshot.c:1174 msgid "" "This is the version of the Engine plug-in API that this plug-in requires. " @@ -1640,7 +1640,7 @@ #: plugins/dos/move.c:828 plugins/dos/segoptions.c:3084 #: plugins/gpt/discovery.c:388 plugins/gpt/move.c:589 plugins/md/md_info.c:806 #: plugins/md/md_main.c:681 plugins/md/raid1_mgr.c:2313 -#: plugins/md/raid5_mgr.c:4008 plugins/s390/390segmgr.c:1410 +#: plugins/md/raid5_mgr.c:4002 plugins/s390/390segmgr.c:1410 #: plugins/s390/move.c:589 ui/gtk/value.c:188 ui/gtk/value.c:321 #: ui/gtk/widget.c:1099 ui/ncurses/value.c:150 ui/ncurses/value.c:257 msgid "Yes" @@ -1651,7 +1651,7 @@ #: plugins/dos/move.c:828 plugins/dos/segoptions.c:3087 #: plugins/gpt/discovery.c:388 plugins/gpt/move.c:589 plugins/md/md_info.c:804 #: plugins/md/md_main.c:681 plugins/md/raid1_mgr.c:2313 -#: plugins/md/raid5_mgr.c:4008 plugins/s390/390segmgr.c:1410 +#: plugins/md/raid5_mgr.c:4002 plugins/s390/390segmgr.c:1410 #: plugins/s390/move.c:589 ui/gtk/value.c:188 ui/gtk/widget.c:1102 #: ui/ncurses/value.c:150 msgid "No" @@ -1930,7 +1930,7 @@ #: plugins/lvm/lvmregmgr.c:1299 plugins/lvm2/lvm2.c:1146 #: plugins/md/linear_mgr.c:1867 plugins/md/multipath.c:2021 #: plugins/md/raid0_mgr.c:3264 plugins/md/raid1_mgr.c:2619 -#: plugins/md/raid5_mgr.c:4514 plugins/replace/replace.c:1571 +#: plugins/md/raid5_mgr.c:4510 plugins/replace/replace.c:1571 #: plugins/snapshot/snapshot.c:1173 msgid "Required Plug-in API Version" msgstr "Required Plug-in API Version" @@ -3272,8 +3272,8 @@ #: plugins/lvm/lvm_discover.c:262 plugins/md/raid1_mgr.c:2894 #: plugins/md/raid1_mgr.c:2988 plugins/md/raid1_mgr.c:3020 -#: plugins/md/raid1_mgr.c:3050 plugins/md/raid5_mgr.c:5252 -#: plugins/md/raid5_mgr.c:5353 plugins/md/raid5_mgr.c:5380 +#: plugins/md/raid1_mgr.c:3050 plugins/md/raid5_mgr.c:5248 +#: plugins/md/raid5_mgr.c:5349 plugins/md/raid5_mgr.c:5376 #: ui/gtk/fsutils.c:585 ui/gtk/main_window_cb.c:617 #: ui/gtk/main_window_cb.c:651 ui/gtk/main_window_cb.c:1041 #: ui/gtk/transfer.c:191 ui/gtk/unassign.c:368 ui/ncurses/fsutils.c:426 @@ -4467,12 +4467,12 @@ msgstr "" #: plugins/md/linear_mgr.c:1398 plugins/md/raid0_mgr.c:2849 -#: plugins/md/raid1_mgr.c:1987 plugins/md/raid5_mgr.c:3609 +#: plugins/md/raid1_mgr.c:1987 plugins/md/raid5_mgr.c:3603 msgid "Choose Yes if you want to create MD version 1 super block." msgstr "" #: plugins/md/linear_mgr.c:1399 plugins/md/raid0_mgr.c:2850 -#: plugins/md/raid1_mgr.c:1988 plugins/md/raid5_mgr.c:3610 +#: plugins/md/raid1_mgr.c:1988 plugins/md/raid5_mgr.c:3604 #, fuzzy msgid "Version 1 Super Block" msgstr "Working SuperBlock" @@ -4739,7 +4739,7 @@ msgstr "The time the volume was created" #: plugins/md/md_info.c:697 plugins/md/md_info.c:698 -#: plugins/md/raid5_mgr.c:3687 +#: plugins/md/raid5_mgr.c:3681 msgid "RAID level" msgstr "RAID level" @@ -4863,7 +4863,7 @@ msgid "The physical layout for a RAID5 array" msgstr "The physical layout for a RAID5 array" -#: plugins/md/md_info.c:1034 plugins/md/raid5_mgr.c:3673 +#: plugins/md/md_info.c:1034 plugins/md/raid5_mgr.c:3667 #: plugins/snapshot/snap_options.c:262 msgid "Chunk size" msgstr "Chunk size" @@ -5113,38 +5113,38 @@ "array is %d. The number of active disks is %d." msgstr "" -#: plugins/md/raid1_mgr.c:2001 plugins/md/raid5_mgr.c:3623 +#: plugins/md/raid1_mgr.c:2001 plugins/md/raid5_mgr.c:3617 msgid "Choose Yes if you want to create a degraded array." msgstr "" -#: plugins/md/raid1_mgr.c:2003 plugins/md/raid5_mgr.c:3625 +#: plugins/md/raid1_mgr.c:2003 plugins/md/raid5_mgr.c:3619 #, fuzzy msgid "Degraded array" msgstr "Degraded" -#: plugins/md/raid1_mgr.c:2020 plugins/md/raid5_mgr.c:3642 +#: plugins/md/raid1_mgr.c:2020 plugins/md/raid5_mgr.c:3636 #, fuzzy msgid "Disk index for missing member." msgstr "Disk index in the array" -#: plugins/md/raid1_mgr.c:2022 plugins/md/raid5_mgr.c:3644 +#: plugins/md/raid1_mgr.c:2022 plugins/md/raid5_mgr.c:3638 msgid "Missing disk index" msgstr "" -#: plugins/md/raid1_mgr.c:2040 plugins/md/raid5_mgr.c:3660 +#: plugins/md/raid1_mgr.c:2040 plugins/md/raid5_mgr.c:3654 msgid "Object to use as a spare disk in the array" msgstr "Object to use as a spare disk in the array" -#: plugins/md/raid1_mgr.c:2042 plugins/md/raid5_mgr.c:3661 +#: plugins/md/raid1_mgr.c:2042 plugins/md/raid5_mgr.c:3655 msgid "Spare Disk" msgstr "Spare Disk" -#: plugins/md/raid1_mgr.c:2172 plugins/md/raid5_mgr.c:3878 +#: plugins/md/raid1_mgr.c:2172 plugins/md/raid5_mgr.c:3872 #: ui/gtk/volume_cb.c:828 ui/gtk/volume_cb.c:1666 ui/ncurses/options.c:1164 msgid "OK" msgstr "OK" -#: plugins/md/raid1_mgr.c:2178 plugins/md/raid5_mgr.c:3884 +#: plugins/md/raid1_mgr.c:2178 plugins/md/raid5_mgr.c:3878 #, c-format msgid "" "The %s object is %s MB larger than the smallest object in the RAID array. " @@ -5153,7 +5153,7 @@ "The %s object is %s MB larger than the smallest object in the RAID array. " "The extra space will not be used.\n" -#: plugins/md/raid1_mgr.c:2343 plugins/md/raid5_mgr.c:4037 +#: plugins/md/raid1_mgr.c:2343 plugins/md/raid5_mgr.c:4031 msgid "Do you really want to create a degraded array?" msgstr "" @@ -5169,11 +5169,11 @@ msgid "Add" msgstr "Add" -#: plugins/md/raid1_mgr.c:2821 plugins/md/raid5_mgr.c:5315 +#: plugins/md/raid1_mgr.c:2821 plugins/md/raid5_mgr.c:5311 msgid "Add spare to fix degraded array" msgstr "Add spare to fix degraded array" -#: plugins/md/raid1_mgr.c:2823 plugins/md/raid5_mgr.c:5317 +#: plugins/md/raid1_mgr.c:2823 plugins/md/raid5_mgr.c:5313 msgid "" "Use this function to add a spare object to replace a missing or faulty entry " "of this degraded region." @@ -5181,7 +5181,7 @@ "Use this function to add a spare object to replace a missing or faulty entry " "of this degraded region." -#: plugins/md/raid1_mgr.c:2827 plugins/md/raid5_mgr.c:5322 +#: plugins/md/raid1_mgr.c:2827 plugins/md/raid5_mgr.c:5318 msgid "" "Use this function to add an object as a spare object for this RAID array." msgstr "" @@ -5197,11 +5197,11 @@ msgstr "" "Use this function to increase the number of mirrors for this RAID array." -#: plugins/md/raid1_mgr.c:2893 plugins/md/raid5_mgr.c:5251 +#: plugins/md/raid1_mgr.c:2893 plugins/md/raid5_mgr.c:5247 msgid "Remove spare object" msgstr "Remove spare object" -#: plugins/md/raid1_mgr.c:2896 plugins/md/raid5_mgr.c:5253 +#: plugins/md/raid1_mgr.c:2896 plugins/md/raid5_mgr.c:5249 msgid "Use this function to remove a spare object from this RAID array." msgstr "Use this function to remove a spare object from this RAID array." @@ -5232,21 +5232,21 @@ msgid "Use this function to remove an active object from this RAID array." msgstr "Use this function to remove an active object from this RAID array." -#: plugins/md/raid1_mgr.c:3019 plugins/md/raid5_mgr.c:5352 +#: plugins/md/raid1_mgr.c:3019 plugins/md/raid5_mgr.c:5348 msgid "Remove a faulty object" msgstr "Remove a faulty object" -#: plugins/md/raid1_mgr.c:3022 plugins/md/raid5_mgr.c:5355 +#: plugins/md/raid1_mgr.c:3022 plugins/md/raid5_mgr.c:5351 msgid "" "Use this function to permanently remove a faulty object from this RAID array." msgstr "" "Use this function to permanently remove a faulty object from this RAID array." -#: plugins/md/raid1_mgr.c:3049 plugins/md/raid5_mgr.c:5379 +#: plugins/md/raid1_mgr.c:3049 plugins/md/raid5_mgr.c:5375 msgid "Remove a stale object" msgstr "Remove a stale object" -#: plugins/md/raid1_mgr.c:3052 plugins/md/raid5_mgr.c:5382 +#: plugins/md/raid1_mgr.c:3052 plugins/md/raid5_mgr.c:5378 msgid "" "Use this function to permanently remove a stale (possibly faulty) object " "from this RAID array." @@ -5254,11 +5254,11 @@ "Use this function to permanently remove a stale (possibly faulty) object " "from this RAID array." -#: plugins/md/raid1_mgr.c:3089 plugins/md/raid5_mgr.c:5415 +#: plugins/md/raid1_mgr.c:3089 plugins/md/raid5_mgr.c:5411 msgid "Mark object faulty" msgstr "Mark object faulty" -#: plugins/md/raid1_mgr.c:3090 plugins/md/raid5_mgr.c:5416 +#: plugins/md/raid1_mgr.c:3090 plugins/md/raid5_mgr.c:5412 msgid "Mark faulty" msgstr "Mark faulty" @@ -5301,38 +5301,38 @@ msgid "A %s MD region requires a minimum of %d objects.\n" msgstr "" -#: plugins/md/raid5_mgr.c:3672 +#: plugins/md/raid5_mgr.c:3666 msgid "Size of the chunks in the RAID array" msgstr "Size of the chunks in the RAID array" -#: plugins/md/raid5_mgr.c:3686 +#: plugins/md/raid5_mgr.c:3680 msgid "RAID Level -- RAID4 or RAID5" msgstr "RAID Level -- RAID4 or RAID5" -#: plugins/md/raid5_mgr.c:3700 +#: plugins/md/raid5_mgr.c:3694 msgid "RAID5 Parity algorithm" msgstr "RAID5 Parity algorithm" -#: plugins/md/raid5_mgr.c:3701 +#: plugins/md/raid5_mgr.c:3695 msgid "RAID5 Algorithm" msgstr "RAID5 Algorithm" -#: plugins/md/raid5_mgr.c:4347 +#: plugins/md/raid5_mgr.c:4343 #, c-format msgid "" "At least one spare object must be left for recovering degraded array %s.\n" msgstr "" "At least one spare object must be left for recovering degraded array %s.\n" -#: plugins/md/raid5_mgr.c:5312 +#: plugins/md/raid5_mgr.c:5308 msgid "Add spare" msgstr "Add spare" -#: plugins/md/raid5_mgr.c:5320 +#: plugins/md/raid5_mgr.c:5316 msgid "Add spare object" msgstr "Add spare object" -#: plugins/md/raid5_mgr.c:5417 +#: plugins/md/raid5_mgr.c:5413 msgid "" "Use this function to mark an object faulty in this RAID array. If the RAID " "array has a spare object, the spare object will be brought on-line to " @@ -5342,6 +5342,13 @@ "array has a spare object, the spare object will be brought on-line to " "replace the faulty object." +#: plugins/md/raid5_mgr.c:5689 +#, c-format +msgid "" +"Array %s is running in degrade mode. At least one spare must be left for " +"the array to recover.\n" +msgstr "" + #: plugins/md/raid5_mgr.h:95 msgid "Left Asymmetric" msgstr "Left Asymmetric" diff -Nru /tmp/08fbspLcCq/evms-2.5.5/po/en@quot.po /tmp/OsUcCqtjNH/evms-2.5.5/po/en@quot.po --- /tmp/08fbspLcCq/evms-2.5.5/po/en@quot.po 2006-12-08 17:15:55.000000000 +0000 +++ /tmp/OsUcCqtjNH/evms-2.5.5/po/en@quot.po 2007-04-10 09:16:35.000000000 +0100 @@ -29,7 +29,7 @@ msgstr "" "Project-Id-Version: EVMS 2.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-02 17:01+0200\n" +"POT-Creation-Date: 2007-04-10 09:16+0100\n" "PO-Revision-Date: 2004-09-17 11:45-0500\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -1140,7 +1140,7 @@ #: plugins/lvm2/lvm2.c:1092 plugins/mac/options.c:176 #: plugins/md/linear_mgr.c:1824 plugins/md/multipath.c:1975 #: plugins/md/raid0_mgr.c:3221 plugins/md/raid1_mgr.c:2576 -#: plugins/md/raid5_mgr.c:4474 plugins/ntfs/ntfsfsim.c:1454 +#: plugins/md/raid5_mgr.c:4470 plugins/ntfs/ntfsfsim.c:1454 #: plugins/ocfs2/ocfs2.c:1696 plugins/ocfs2/ocfs2.c:1697 #: plugins/ogfs/fs_ogfs.c:2985 plugins/reiser/reiserfs.c:1657 #: plugins/replace/replace.c:1533 plugins/rsct/rsct_ece.c:981 @@ -1158,7 +1158,7 @@ #: plugins/lvm2/lvm2.c:1093 plugins/mac/options.c:177 #: plugins/md/linear_mgr.c:1825 plugins/md/multipath.c:1976 #: plugins/md/raid0_mgr.c:3222 plugins/md/raid1_mgr.c:2577 -#: plugins/md/raid5_mgr.c:4475 plugins/ntfs/ntfsfsim.c:1455 +#: plugins/md/raid5_mgr.c:4471 plugins/ntfs/ntfsfsim.c:1455 #: plugins/ogfs/fs_ogfs.c:2986 plugins/reiser/reiserfs.c:1658 #: plugins/replace/replace.c:1534 plugins/rsct/rsct_ece.c:982 #: plugins/s390/options.c:2325 plugins/snapshot/snapshot.c:1125 @@ -1175,7 +1175,7 @@ #: plugins/lvm2/lvm2.c:1100 plugins/mac/options.c:185 #: plugins/md/linear_mgr.c:1832 plugins/md/multipath.c:1983 #: plugins/md/raid0_mgr.c:3229 plugins/md/raid1_mgr.c:2584 -#: plugins/md/raid5_mgr.c:4481 plugins/ntfs/ntfsfsim.c:1463 +#: plugins/md/raid5_mgr.c:4477 plugins/ntfs/ntfsfsim.c:1463 #: plugins/ocfs2/ocfs2.c:1702 plugins/ocfs2/ocfs2.c:1703 #: plugins/ogfs/fs_ogfs.c:2994 plugins/reiser/reiserfs.c:1666 #: plugins/replace/replace.c:1540 plugins/rsct/rsct_ece.c:988 @@ -1193,7 +1193,7 @@ #: plugins/lvm2/lvm2.c:1101 plugins/mac/options.c:186 #: plugins/md/linear_mgr.c:1833 plugins/md/multipath.c:1984 #: plugins/md/raid0_mgr.c:3230 plugins/md/raid1_mgr.c:2585 -#: plugins/md/raid5_mgr.c:4482 plugins/ntfs/ntfsfsim.c:1464 +#: plugins/md/raid5_mgr.c:4478 plugins/ntfs/ntfsfsim.c:1464 #: plugins/ogfs/fs_ogfs.c:2995 plugins/reiser/reiserfs.c:1667 #: plugins/replace/replace.c:1541 plugins/rsct/rsct_ece.c:989 #: plugins/s390/options.c:2334 plugins/snapshot/snapshot.c:1133 @@ -1209,7 +1209,7 @@ #: plugins/jfs/fs_jfs.c:1733 plugins/lvm/lvmregmgr.c:1268 #: plugins/mac/options.c:194 plugins/md/linear_mgr.c:1840 #: plugins/md/multipath.c:1991 plugins/md/raid0_mgr.c:3237 -#: plugins/md/raid1_mgr.c:2592 plugins/md/raid5_mgr.c:4488 +#: plugins/md/raid1_mgr.c:2592 plugins/md/raid5_mgr.c:4484 #: plugins/ntfs/ntfsfsim.c:1472 plugins/ogfs/fs_ogfs.c:3003 #: plugins/reiser/reiserfs.c:1675 plugins/replace/replace.c:1547 #: plugins/rsct/rsct_ece.c:995 plugins/s390/options.c:2342 @@ -1227,7 +1227,7 @@ #: plugins/lvm2/lvm2.c:1109 plugins/mac/options.c:195 #: plugins/md/linear_mgr.c:1841 plugins/md/multipath.c:1992 #: plugins/md/raid0_mgr.c:3238 plugins/md/raid1_mgr.c:2593 -#: plugins/md/raid5_mgr.c:4489 plugins/ntfs/ntfsfsim.c:1473 +#: plugins/md/raid5_mgr.c:4485 plugins/ntfs/ntfsfsim.c:1473 #: plugins/ogfs/fs_ogfs.c:3004 plugins/reiser/reiserfs.c:1676 #: plugins/replace/replace.c:1548 plugins/s390/options.c:2343 #: plugins/snapshot/snapshot.c:1141 plugins/swap/swapfs.c:960 @@ -1251,7 +1251,7 @@ #: plugins/lvm/lvmregmgr.c:1276 plugins/mac/options.c:203 #: plugins/md/linear_mgr.c:1848 plugins/md/multipath.c:1999 #: plugins/md/raid0_mgr.c:3245 plugins/md/raid1_mgr.c:2600 -#: plugins/md/raid5_mgr.c:4495 plugins/ntfs/ntfsfsim.c:1481 +#: plugins/md/raid5_mgr.c:4491 plugins/ntfs/ntfsfsim.c:1481 #: plugins/ogfs/fs_ogfs.c:3012 plugins/reiser/reiserfs.c:1684 #: plugins/replace/replace.c:1554 plugins/rsct/rsct_ece.c:1003 #: plugins/s390/options.c:2351 plugins/snapshot/snapshot.c:1148 @@ -1264,7 +1264,7 @@ #: plugins/fat/fatfsim.c:984 plugins/ha/ece.c:2412 plugins/jfs/fs_jfs.c:1743 #: plugins/lvm/lvmregmgr.c:1277 plugins/md/linear_mgr.c:1849 #: plugins/md/multipath.c:2000 plugins/md/raid0_mgr.c:3246 -#: plugins/md/raid1_mgr.c:2601 plugins/md/raid5_mgr.c:4496 +#: plugins/md/raid1_mgr.c:2601 plugins/md/raid5_mgr.c:4492 #: plugins/ntfs/ntfsfsim.c:1482 plugins/ogfs/fs_ogfs.c:3013 #: plugins/reiser/reiserfs.c:1685 plugins/replace/replace.c:1555 #: plugins/rsct/rsct_ece.c:1005 plugins/snapshot/snapshot.c:1149 @@ -1280,7 +1280,7 @@ #: plugins/lvm/lvmregmgr.c:1286 plugins/lvm2/lvm2.c:1132 #: plugins/mac/options.c:212 plugins/md/linear_mgr.c:1857 #: plugins/md/multipath.c:2008 plugins/md/raid0_mgr.c:3254 -#: plugins/md/raid1_mgr.c:2609 plugins/md/raid5_mgr.c:4504 +#: plugins/md/raid1_mgr.c:2609 plugins/md/raid5_mgr.c:4500 #: plugins/ntfs/ntfsfsim.c:1490 plugins/ocfs2/ocfs2.c:1720 #: plugins/ocfs2/ocfs2.c:1721 plugins/ogfs/fs_ogfs.c:3021 #: plugins/reiser/reiserfs.c:1693 plugins/replace/replace.c:1562 @@ -1296,7 +1296,7 @@ #: plugins/jfs/fs_jfs.c:1752 plugins/lvm/lvmregmgr.c:1287 #: plugins/md/linear_mgr.c:1858 plugins/md/multipath.c:2009 #: plugins/md/raid0_mgr.c:3255 plugins/md/raid1_mgr.c:2610 -#: plugins/md/raid5_mgr.c:4505 plugins/ntfs/ntfsfsim.c:1491 +#: plugins/md/raid5_mgr.c:4501 plugins/ntfs/ntfsfsim.c:1491 #: plugins/ocfs2/ocfs2.c:1722 plugins/ogfs/fs_ogfs.c:3022 #: plugins/reiser/reiserfs.c:1694 plugins/replace/replace.c:1563 #: plugins/rsct/rsct_ece.c:1015 plugins/snapshot/snapshot.c:1161 @@ -1318,7 +1318,7 @@ #: plugins/bbr/bbroptions.c:588 plugins/dos/segoptions.c:3319 #: plugins/lvm/lvmregmgr.c:1300 plugins/md/linear_mgr.c:1868 #: plugins/md/multipath.c:2022 plugins/md/raid0_mgr.c:3265 -#: plugins/md/raid1_mgr.c:2620 plugins/md/raid5_mgr.c:4515 +#: plugins/md/raid1_mgr.c:2620 plugins/md/raid5_mgr.c:4511 #: plugins/replace/replace.c:1572 plugins/snapshot/snapshot.c:1174 msgid "" "This is the version of the Engine plug-in API that this plug-in requires. " @@ -1636,7 +1636,7 @@ #: plugins/dos/move.c:828 plugins/dos/segoptions.c:3084 #: plugins/gpt/discovery.c:388 plugins/gpt/move.c:589 plugins/md/md_info.c:806 #: plugins/md/md_main.c:681 plugins/md/raid1_mgr.c:2313 -#: plugins/md/raid5_mgr.c:4008 plugins/s390/390segmgr.c:1410 +#: plugins/md/raid5_mgr.c:4002 plugins/s390/390segmgr.c:1410 #: plugins/s390/move.c:589 ui/gtk/value.c:188 ui/gtk/value.c:321 #: ui/gtk/widget.c:1099 ui/ncurses/value.c:150 ui/ncurses/value.c:257 msgid "Yes" @@ -1647,7 +1647,7 @@ #: plugins/dos/move.c:828 plugins/dos/segoptions.c:3087 #: plugins/gpt/discovery.c:388 plugins/gpt/move.c:589 plugins/md/md_info.c:804 #: plugins/md/md_main.c:681 plugins/md/raid1_mgr.c:2313 -#: plugins/md/raid5_mgr.c:4008 plugins/s390/390segmgr.c:1410 +#: plugins/md/raid5_mgr.c:4002 plugins/s390/390segmgr.c:1410 #: plugins/s390/move.c:589 ui/gtk/value.c:188 ui/gtk/widget.c:1102 #: ui/ncurses/value.c:150 msgid "No" @@ -1926,7 +1926,7 @@ #: plugins/lvm/lvmregmgr.c:1299 plugins/lvm2/lvm2.c:1146 #: plugins/md/linear_mgr.c:1867 plugins/md/multipath.c:2021 #: plugins/md/raid0_mgr.c:3264 plugins/md/raid1_mgr.c:2619 -#: plugins/md/raid5_mgr.c:4514 plugins/replace/replace.c:1571 +#: plugins/md/raid5_mgr.c:4510 plugins/replace/replace.c:1571 #: plugins/snapshot/snapshot.c:1173 msgid "Required Plug-in API Version" msgstr "Required Plug-in API Version" @@ -3268,8 +3268,8 @@ #: plugins/lvm/lvm_discover.c:262 plugins/md/raid1_mgr.c:2894 #: plugins/md/raid1_mgr.c:2988 plugins/md/raid1_mgr.c:3020 -#: plugins/md/raid1_mgr.c:3050 plugins/md/raid5_mgr.c:5252 -#: plugins/md/raid5_mgr.c:5353 plugins/md/raid5_mgr.c:5380 +#: plugins/md/raid1_mgr.c:3050 plugins/md/raid5_mgr.c:5248 +#: plugins/md/raid5_mgr.c:5349 plugins/md/raid5_mgr.c:5376 #: ui/gtk/fsutils.c:585 ui/gtk/main_window_cb.c:617 #: ui/gtk/main_window_cb.c:651 ui/gtk/main_window_cb.c:1041 #: ui/gtk/transfer.c:191 ui/gtk/unassign.c:368 ui/ncurses/fsutils.c:426 @@ -4463,12 +4463,12 @@ msgstr "" #: plugins/md/linear_mgr.c:1398 plugins/md/raid0_mgr.c:2849 -#: plugins/md/raid1_mgr.c:1987 plugins/md/raid5_mgr.c:3609 +#: plugins/md/raid1_mgr.c:1987 plugins/md/raid5_mgr.c:3603 msgid "Choose Yes if you want to create MD version 1 super block." msgstr "" #: plugins/md/linear_mgr.c:1399 plugins/md/raid0_mgr.c:2850 -#: plugins/md/raid1_mgr.c:1988 plugins/md/raid5_mgr.c:3610 +#: plugins/md/raid1_mgr.c:1988 plugins/md/raid5_mgr.c:3604 #, fuzzy msgid "Version 1 Super Block" msgstr "Working SuperBlock" @@ -4735,7 +4735,7 @@ msgstr "The time the volume was created" #: plugins/md/md_info.c:697 plugins/md/md_info.c:698 -#: plugins/md/raid5_mgr.c:3687 +#: plugins/md/raid5_mgr.c:3681 msgid "RAID level" msgstr "RAID level" @@ -4859,7 +4859,7 @@ msgid "The physical layout for a RAID5 array" msgstr "The physical layout for a RAID5 array" -#: plugins/md/md_info.c:1034 plugins/md/raid5_mgr.c:3673 +#: plugins/md/md_info.c:1034 plugins/md/raid5_mgr.c:3667 #: plugins/snapshot/snap_options.c:262 msgid "Chunk size" msgstr "Chunk size" @@ -5109,38 +5109,38 @@ "array is %d. The number of active disks is %d." msgstr "" -#: plugins/md/raid1_mgr.c:2001 plugins/md/raid5_mgr.c:3623 +#: plugins/md/raid1_mgr.c:2001 plugins/md/raid5_mgr.c:3617 msgid "Choose Yes if you want to create a degraded array." msgstr "" -#: plugins/md/raid1_mgr.c:2003 plugins/md/raid5_mgr.c:3625 +#: plugins/md/raid1_mgr.c:2003 plugins/md/raid5_mgr.c:3619 #, fuzzy msgid "Degraded array" msgstr "Degraded" -#: plugins/md/raid1_mgr.c:2020 plugins/md/raid5_mgr.c:3642 +#: plugins/md/raid1_mgr.c:2020 plugins/md/raid5_mgr.c:3636 #, fuzzy msgid "Disk index for missing member." msgstr "Disk index in the array" -#: plugins/md/raid1_mgr.c:2022 plugins/md/raid5_mgr.c:3644 +#: plugins/md/raid1_mgr.c:2022 plugins/md/raid5_mgr.c:3638 msgid "Missing disk index" msgstr "" -#: plugins/md/raid1_mgr.c:2040 plugins/md/raid5_mgr.c:3660 +#: plugins/md/raid1_mgr.c:2040 plugins/md/raid5_mgr.c:3654 msgid "Object to use as a spare disk in the array" msgstr "Object to use as a spare disk in the array" -#: plugins/md/raid1_mgr.c:2042 plugins/md/raid5_mgr.c:3661 +#: plugins/md/raid1_mgr.c:2042 plugins/md/raid5_mgr.c:3655 msgid "Spare Disk" msgstr "Spare Disk" -#: plugins/md/raid1_mgr.c:2172 plugins/md/raid5_mgr.c:3878 +#: plugins/md/raid1_mgr.c:2172 plugins/md/raid5_mgr.c:3872 #: ui/gtk/volume_cb.c:828 ui/gtk/volume_cb.c:1666 ui/ncurses/options.c:1164 msgid "OK" msgstr "OK" -#: plugins/md/raid1_mgr.c:2178 plugins/md/raid5_mgr.c:3884 +#: plugins/md/raid1_mgr.c:2178 plugins/md/raid5_mgr.c:3878 #, c-format msgid "" "The %s object is %s MB larger than the smallest object in the RAID array. " @@ -5149,7 +5149,7 @@ "The %s object is %s MB larger than the smallest object in the RAID array. " "The extra space will not be used.\n" -#: plugins/md/raid1_mgr.c:2343 plugins/md/raid5_mgr.c:4037 +#: plugins/md/raid1_mgr.c:2343 plugins/md/raid5_mgr.c:4031 msgid "Do you really want to create a degraded array?" msgstr "" @@ -5165,11 +5165,11 @@ msgid "Add" msgstr "Add" -#: plugins/md/raid1_mgr.c:2821 plugins/md/raid5_mgr.c:5315 +#: plugins/md/raid1_mgr.c:2821 plugins/md/raid5_mgr.c:5311 msgid "Add spare to fix degraded array" msgstr "Add spare to fix degraded array" -#: plugins/md/raid1_mgr.c:2823 plugins/md/raid5_mgr.c:5317 +#: plugins/md/raid1_mgr.c:2823 plugins/md/raid5_mgr.c:5313 msgid "" "Use this function to add a spare object to replace a missing or faulty entry " "of this degraded region." @@ -5177,7 +5177,7 @@ "Use this function to add a spare object to replace a missing or faulty entry " "of this degraded region." -#: plugins/md/raid1_mgr.c:2827 plugins/md/raid5_mgr.c:5322 +#: plugins/md/raid1_mgr.c:2827 plugins/md/raid5_mgr.c:5318 msgid "" "Use this function to add an object as a spare object for this RAID array." msgstr "" @@ -5193,11 +5193,11 @@ msgstr "" "Use this function to increase the number of mirrors for this RAID array." -#: plugins/md/raid1_mgr.c:2893 plugins/md/raid5_mgr.c:5251 +#: plugins/md/raid1_mgr.c:2893 plugins/md/raid5_mgr.c:5247 msgid "Remove spare object" msgstr "Remove spare object" -#: plugins/md/raid1_mgr.c:2896 plugins/md/raid5_mgr.c:5253 +#: plugins/md/raid1_mgr.c:2896 plugins/md/raid5_mgr.c:5249 msgid "Use this function to remove a spare object from this RAID array." msgstr "Use this function to remove a spare object from this RAID array." @@ -5228,21 +5228,21 @@ msgid "Use this function to remove an active object from this RAID array." msgstr "Use this function to remove an active object from this RAID array." -#: plugins/md/raid1_mgr.c:3019 plugins/md/raid5_mgr.c:5352 +#: plugins/md/raid1_mgr.c:3019 plugins/md/raid5_mgr.c:5348 msgid "Remove a faulty object" msgstr "Remove a faulty object" -#: plugins/md/raid1_mgr.c:3022 plugins/md/raid5_mgr.c:5355 +#: plugins/md/raid1_mgr.c:3022 plugins/md/raid5_mgr.c:5351 msgid "" "Use this function to permanently remove a faulty object from this RAID array." msgstr "" "Use this function to permanently remove a faulty object from this RAID array." -#: plugins/md/raid1_mgr.c:3049 plugins/md/raid5_mgr.c:5379 +#: plugins/md/raid1_mgr.c:3049 plugins/md/raid5_mgr.c:5375 msgid "Remove a stale object" msgstr "Remove a stale object" -#: plugins/md/raid1_mgr.c:3052 plugins/md/raid5_mgr.c:5382 +#: plugins/md/raid1_mgr.c:3052 plugins/md/raid5_mgr.c:5378 msgid "" "Use this function to permanently remove a stale (possibly faulty) object " "from this RAID array." @@ -5250,11 +5250,11 @@ "Use this function to permanently remove a stale (possibly faulty) object " "from this RAID array." -#: plugins/md/raid1_mgr.c:3089 plugins/md/raid5_mgr.c:5415 +#: plugins/md/raid1_mgr.c:3089 plugins/md/raid5_mgr.c:5411 msgid "Mark object faulty" msgstr "Mark object faulty" -#: plugins/md/raid1_mgr.c:3090 plugins/md/raid5_mgr.c:5416 +#: plugins/md/raid1_mgr.c:3090 plugins/md/raid5_mgr.c:5412 msgid "Mark faulty" msgstr "Mark faulty" @@ -5297,38 +5297,38 @@ msgid "A %s MD region requires a minimum of %d objects.\n" msgstr "" -#: plugins/md/raid5_mgr.c:3672 +#: plugins/md/raid5_mgr.c:3666 msgid "Size of the chunks in the RAID array" msgstr "Size of the chunks in the RAID array" -#: plugins/md/raid5_mgr.c:3686 +#: plugins/md/raid5_mgr.c:3680 msgid "RAID Level -- RAID4 or RAID5" msgstr "RAID Level -- RAID4 or RAID5" -#: plugins/md/raid5_mgr.c:3700 +#: plugins/md/raid5_mgr.c:3694 msgid "RAID5 Parity algorithm" msgstr "RAID5 Parity algorithm" -#: plugins/md/raid5_mgr.c:3701 +#: plugins/md/raid5_mgr.c:3695 msgid "RAID5 Algorithm" msgstr "RAID5 Algorithm" -#: plugins/md/raid5_mgr.c:4347 +#: plugins/md/raid5_mgr.c:4343 #, c-format msgid "" "At least one spare object must be left for recovering degraded array %s.\n" msgstr "" "At least one spare object must be left for recovering degraded array %s.\n" -#: plugins/md/raid5_mgr.c:5312 +#: plugins/md/raid5_mgr.c:5308 msgid "Add spare" msgstr "Add spare" -#: plugins/md/raid5_mgr.c:5320 +#: plugins/md/raid5_mgr.c:5316 msgid "Add spare object" msgstr "Add spare object" -#: plugins/md/raid5_mgr.c:5417 +#: plugins/md/raid5_mgr.c:5413 msgid "" "Use this function to mark an object faulty in this RAID array. If the RAID " "array has a spare object, the spare object will be brought on-line to " @@ -5338,6 +5338,13 @@ "array has a spare object, the spare object will be brought on-line to " "replace the faulty object." +#: plugins/md/raid5_mgr.c:5689 +#, c-format +msgid "" +"Array %s is running in degrade mode. At least one spare must be left for " +"the array to recover.\n" +msgstr "" + #: plugins/md/raid5_mgr.h:95 msgid "Left Asymmetric" msgstr "Left Asymmetric" diff -Nru /tmp/08fbspLcCq/evms-2.5.5/po/evms.pot /tmp/OsUcCqtjNH/evms-2.5.5/po/evms.pot --- /tmp/08fbspLcCq/evms-2.5.5/po/evms.pot 2006-12-08 17:15:55.000000000 +0000 +++ /tmp/OsUcCqtjNH/evms-2.5.5/po/evms.pot 2007-04-10 09:16:35.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-02 17:01+0200\n" +"POT-Creation-Date: 2007-04-10 09:16+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -935,7 +935,7 @@ #: plugins/lvm2/lvm2.c:1092 plugins/mac/options.c:176 #: plugins/md/linear_mgr.c:1824 plugins/md/multipath.c:1975 #: plugins/md/raid0_mgr.c:3221 plugins/md/raid1_mgr.c:2576 -#: plugins/md/raid5_mgr.c:4474 plugins/ntfs/ntfsfsim.c:1454 +#: plugins/md/raid5_mgr.c:4470 plugins/ntfs/ntfsfsim.c:1454 #: plugins/ocfs2/ocfs2.c:1696 plugins/ocfs2/ocfs2.c:1697 #: plugins/ogfs/fs_ogfs.c:2985 plugins/reiser/reiserfs.c:1657 #: plugins/replace/replace.c:1533 plugins/rsct/rsct_ece.c:981 @@ -953,7 +953,7 @@ #: plugins/lvm2/lvm2.c:1093 plugins/mac/options.c:177 #: plugins/md/linear_mgr.c:1825 plugins/md/multipath.c:1976 #: plugins/md/raid0_mgr.c:3222 plugins/md/raid1_mgr.c:2577 -#: plugins/md/raid5_mgr.c:4475 plugins/ntfs/ntfsfsim.c:1455 +#: plugins/md/raid5_mgr.c:4471 plugins/ntfs/ntfsfsim.c:1455 #: plugins/ogfs/fs_ogfs.c:2986 plugins/reiser/reiserfs.c:1658 #: plugins/replace/replace.c:1534 plugins/rsct/rsct_ece.c:982 #: plugins/s390/options.c:2325 plugins/snapshot/snapshot.c:1125 @@ -970,7 +970,7 @@ #: plugins/lvm2/lvm2.c:1100 plugins/mac/options.c:185 #: plugins/md/linear_mgr.c:1832 plugins/md/multipath.c:1983 #: plugins/md/raid0_mgr.c:3229 plugins/md/raid1_mgr.c:2584 -#: plugins/md/raid5_mgr.c:4481 plugins/ntfs/ntfsfsim.c:1463 +#: plugins/md/raid5_mgr.c:4477 plugins/ntfs/ntfsfsim.c:1463 #: plugins/ocfs2/ocfs2.c:1702 plugins/ocfs2/ocfs2.c:1703 #: plugins/ogfs/fs_ogfs.c:2994 plugins/reiser/reiserfs.c:1666 #: plugins/replace/replace.c:1540 plugins/rsct/rsct_ece.c:988 @@ -988,7 +988,7 @@ #: plugins/lvm2/lvm2.c:1101 plugins/mac/options.c:186 #: plugins/md/linear_mgr.c:1833 plugins/md/multipath.c:1984 #: plugins/md/raid0_mgr.c:3230 plugins/md/raid1_mgr.c:2585 -#: plugins/md/raid5_mgr.c:4482 plugins/ntfs/ntfsfsim.c:1464 +#: plugins/md/raid5_mgr.c:4478 plugins/ntfs/ntfsfsim.c:1464 #: plugins/ogfs/fs_ogfs.c:2995 plugins/reiser/reiserfs.c:1667 #: plugins/replace/replace.c:1541 plugins/rsct/rsct_ece.c:989 #: plugins/s390/options.c:2334 plugins/snapshot/snapshot.c:1133 @@ -1004,7 +1004,7 @@ #: plugins/jfs/fs_jfs.c:1733 plugins/lvm/lvmregmgr.c:1268 #: plugins/mac/options.c:194 plugins/md/linear_mgr.c:1840 #: plugins/md/multipath.c:1991 plugins/md/raid0_mgr.c:3237 -#: plugins/md/raid1_mgr.c:2592 plugins/md/raid5_mgr.c:4488 +#: plugins/md/raid1_mgr.c:2592 plugins/md/raid5_mgr.c:4484 #: plugins/ntfs/ntfsfsim.c:1472 plugins/ogfs/fs_ogfs.c:3003 #: plugins/reiser/reiserfs.c:1675 plugins/replace/replace.c:1547 #: plugins/rsct/rsct_ece.c:995 plugins/s390/options.c:2342 @@ -1022,7 +1022,7 @@ #: plugins/lvm2/lvm2.c:1109 plugins/mac/options.c:195 #: plugins/md/linear_mgr.c:1841 plugins/md/multipath.c:1992 #: plugins/md/raid0_mgr.c:3238 plugins/md/raid1_mgr.c:2593 -#: plugins/md/raid5_mgr.c:4489 plugins/ntfs/ntfsfsim.c:1473 +#: plugins/md/raid5_mgr.c:4485 plugins/ntfs/ntfsfsim.c:1473 #: plugins/ogfs/fs_ogfs.c:3004 plugins/reiser/reiserfs.c:1676 #: plugins/replace/replace.c:1548 plugins/s390/options.c:2343 #: plugins/snapshot/snapshot.c:1141 plugins/swap/swapfs.c:960 @@ -1044,7 +1044,7 @@ #: plugins/lvm/lvmregmgr.c:1276 plugins/mac/options.c:203 #: plugins/md/linear_mgr.c:1848 plugins/md/multipath.c:1999 #: plugins/md/raid0_mgr.c:3245 plugins/md/raid1_mgr.c:2600 -#: plugins/md/raid5_mgr.c:4495 plugins/ntfs/ntfsfsim.c:1481 +#: plugins/md/raid5_mgr.c:4491 plugins/ntfs/ntfsfsim.c:1481 #: plugins/ogfs/fs_ogfs.c:3012 plugins/reiser/reiserfs.c:1684 #: plugins/replace/replace.c:1554 plugins/rsct/rsct_ece.c:1003 #: plugins/s390/options.c:2351 plugins/snapshot/snapshot.c:1148 @@ -1057,7 +1057,7 @@ #: plugins/fat/fatfsim.c:984 plugins/ha/ece.c:2412 plugins/jfs/fs_jfs.c:1743 #: plugins/lvm/lvmregmgr.c:1277 plugins/md/linear_mgr.c:1849 #: plugins/md/multipath.c:2000 plugins/md/raid0_mgr.c:3246 -#: plugins/md/raid1_mgr.c:2601 plugins/md/raid5_mgr.c:4496 +#: plugins/md/raid1_mgr.c:2601 plugins/md/raid5_mgr.c:4492 #: plugins/ntfs/ntfsfsim.c:1482 plugins/ogfs/fs_ogfs.c:3013 #: plugins/reiser/reiserfs.c:1685 plugins/replace/replace.c:1555 #: plugins/rsct/rsct_ece.c:1005 plugins/snapshot/snapshot.c:1149 @@ -1073,7 +1073,7 @@ #: plugins/lvm/lvmregmgr.c:1286 plugins/lvm2/lvm2.c:1132 #: plugins/mac/options.c:212 plugins/md/linear_mgr.c:1857 #: plugins/md/multipath.c:2008 plugins/md/raid0_mgr.c:3254 -#: plugins/md/raid1_mgr.c:2609 plugins/md/raid5_mgr.c:4504 +#: plugins/md/raid1_mgr.c:2609 plugins/md/raid5_mgr.c:4500 #: plugins/ntfs/ntfsfsim.c:1490 plugins/ocfs2/ocfs2.c:1720 #: plugins/ocfs2/ocfs2.c:1721 plugins/ogfs/fs_ogfs.c:3021 #: plugins/reiser/reiserfs.c:1693 plugins/replace/replace.c:1562 @@ -1089,7 +1089,7 @@ #: plugins/jfs/fs_jfs.c:1752 plugins/lvm/lvmregmgr.c:1287 #: plugins/md/linear_mgr.c:1858 plugins/md/multipath.c:2009 #: plugins/md/raid0_mgr.c:3255 plugins/md/raid1_mgr.c:2610 -#: plugins/md/raid5_mgr.c:4505 plugins/ntfs/ntfsfsim.c:1491 +#: plugins/md/raid5_mgr.c:4501 plugins/ntfs/ntfsfsim.c:1491 #: plugins/ocfs2/ocfs2.c:1722 plugins/ogfs/fs_ogfs.c:3022 #: plugins/reiser/reiserfs.c:1694 plugins/replace/replace.c:1563 #: plugins/rsct/rsct_ece.c:1015 plugins/snapshot/snapshot.c:1161 @@ -1109,7 +1109,7 @@ #: plugins/bbr/bbroptions.c:588 plugins/dos/segoptions.c:3319 #: plugins/lvm/lvmregmgr.c:1300 plugins/md/linear_mgr.c:1868 #: plugins/md/multipath.c:2022 plugins/md/raid0_mgr.c:3265 -#: plugins/md/raid1_mgr.c:2620 plugins/md/raid5_mgr.c:4515 +#: plugins/md/raid1_mgr.c:2620 plugins/md/raid5_mgr.c:4511 #: plugins/replace/replace.c:1572 plugins/snapshot/snapshot.c:1174 msgid "" "This is the version of the Engine plug-in API that this plug-in requires. " @@ -1391,7 +1391,7 @@ #: plugins/dos/move.c:828 plugins/dos/segoptions.c:3084 #: plugins/gpt/discovery.c:388 plugins/gpt/move.c:589 plugins/md/md_info.c:806 #: plugins/md/md_main.c:681 plugins/md/raid1_mgr.c:2313 -#: plugins/md/raid5_mgr.c:4008 plugins/s390/390segmgr.c:1410 +#: plugins/md/raid5_mgr.c:4002 plugins/s390/390segmgr.c:1410 #: plugins/s390/move.c:589 ui/gtk/value.c:188 ui/gtk/value.c:321 #: ui/gtk/widget.c:1099 ui/ncurses/value.c:150 ui/ncurses/value.c:257 msgid "Yes" @@ -1402,7 +1402,7 @@ #: plugins/dos/move.c:828 plugins/dos/segoptions.c:3087 #: plugins/gpt/discovery.c:388 plugins/gpt/move.c:589 plugins/md/md_info.c:804 #: plugins/md/md_main.c:681 plugins/md/raid1_mgr.c:2313 -#: plugins/md/raid5_mgr.c:4008 plugins/s390/390segmgr.c:1410 +#: plugins/md/raid5_mgr.c:4002 plugins/s390/390segmgr.c:1410 #: plugins/s390/move.c:589 ui/gtk/value.c:188 ui/gtk/widget.c:1102 #: ui/ncurses/value.c:150 msgid "No" @@ -1654,7 +1654,7 @@ #: plugins/lvm/lvmregmgr.c:1299 plugins/lvm2/lvm2.c:1146 #: plugins/md/linear_mgr.c:1867 plugins/md/multipath.c:2021 #: plugins/md/raid0_mgr.c:3264 plugins/md/raid1_mgr.c:2619 -#: plugins/md/raid5_mgr.c:4514 plugins/replace/replace.c:1571 +#: plugins/md/raid5_mgr.c:4510 plugins/replace/replace.c:1571 #: plugins/snapshot/snapshot.c:1173 msgid "Required Plug-in API Version" msgstr "" @@ -2861,8 +2861,8 @@ #: plugins/lvm/lvm_discover.c:262 plugins/md/raid1_mgr.c:2894 #: plugins/md/raid1_mgr.c:2988 plugins/md/raid1_mgr.c:3020 -#: plugins/md/raid1_mgr.c:3050 plugins/md/raid5_mgr.c:5252 -#: plugins/md/raid5_mgr.c:5353 plugins/md/raid5_mgr.c:5380 +#: plugins/md/raid1_mgr.c:3050 plugins/md/raid5_mgr.c:5248 +#: plugins/md/raid5_mgr.c:5349 plugins/md/raid5_mgr.c:5376 #: ui/gtk/fsutils.c:585 ui/gtk/main_window_cb.c:617 #: ui/gtk/main_window_cb.c:651 ui/gtk/main_window_cb.c:1041 #: ui/gtk/transfer.c:191 ui/gtk/unassign.c:368 ui/ncurses/fsutils.c:426 @@ -3963,12 +3963,12 @@ msgstr "" #: plugins/md/linear_mgr.c:1398 plugins/md/raid0_mgr.c:2849 -#: plugins/md/raid1_mgr.c:1987 plugins/md/raid5_mgr.c:3609 +#: plugins/md/raid1_mgr.c:1987 plugins/md/raid5_mgr.c:3603 msgid "Choose Yes if you want to create MD version 1 super block." msgstr "" #: plugins/md/linear_mgr.c:1399 plugins/md/raid0_mgr.c:2850 -#: plugins/md/raid1_mgr.c:1988 plugins/md/raid5_mgr.c:3610 +#: plugins/md/raid1_mgr.c:1988 plugins/md/raid5_mgr.c:3604 msgid "Version 1 Super Block" msgstr "" @@ -4232,7 +4232,7 @@ msgstr "" #: plugins/md/md_info.c:697 plugins/md/md_info.c:698 -#: plugins/md/raid5_mgr.c:3687 +#: plugins/md/raid5_mgr.c:3681 msgid "RAID level" msgstr "" @@ -4356,7 +4356,7 @@ msgid "The physical layout for a RAID5 array" msgstr "" -#: plugins/md/md_info.c:1034 plugins/md/raid5_mgr.c:3673 +#: plugins/md/md_info.c:1034 plugins/md/raid5_mgr.c:3667 #: plugins/snapshot/snap_options.c:262 msgid "Chunk size" msgstr "" @@ -4570,43 +4570,43 @@ "array is %d. The number of active disks is %d." msgstr "" -#: plugins/md/raid1_mgr.c:2001 plugins/md/raid5_mgr.c:3623 +#: plugins/md/raid1_mgr.c:2001 plugins/md/raid5_mgr.c:3617 msgid "Choose Yes if you want to create a degraded array." msgstr "" -#: plugins/md/raid1_mgr.c:2003 plugins/md/raid5_mgr.c:3625 +#: plugins/md/raid1_mgr.c:2003 plugins/md/raid5_mgr.c:3619 msgid "Degraded array" msgstr "" -#: plugins/md/raid1_mgr.c:2020 plugins/md/raid5_mgr.c:3642 +#: plugins/md/raid1_mgr.c:2020 plugins/md/raid5_mgr.c:3636 msgid "Disk index for missing member." msgstr "" -#: plugins/md/raid1_mgr.c:2022 plugins/md/raid5_mgr.c:3644 +#: plugins/md/raid1_mgr.c:2022 plugins/md/raid5_mgr.c:3638 msgid "Missing disk index" msgstr "" -#: plugins/md/raid1_mgr.c:2040 plugins/md/raid5_mgr.c:3660 +#: plugins/md/raid1_mgr.c:2040 plugins/md/raid5_mgr.c:3654 msgid "Object to use as a spare disk in the array" msgstr "" -#: plugins/md/raid1_mgr.c:2042 plugins/md/raid5_mgr.c:3661 +#: plugins/md/raid1_mgr.c:2042 plugins/md/raid5_mgr.c:3655 msgid "Spare Disk" msgstr "" -#: plugins/md/raid1_mgr.c:2172 plugins/md/raid5_mgr.c:3878 +#: plugins/md/raid1_mgr.c:2172 plugins/md/raid5_mgr.c:3872 #: ui/gtk/volume_cb.c:828 ui/gtk/volume_cb.c:1666 ui/ncurses/options.c:1164 msgid "OK" msgstr "" -#: plugins/md/raid1_mgr.c:2178 plugins/md/raid5_mgr.c:3884 +#: plugins/md/raid1_mgr.c:2178 plugins/md/raid5_mgr.c:3878 #, c-format msgid "" "The %s object is %s MB larger than the smallest object in the RAID array. " "The extra space will not be used.\n" msgstr "" -#: plugins/md/raid1_mgr.c:2343 plugins/md/raid5_mgr.c:4037 +#: plugins/md/raid1_mgr.c:2343 plugins/md/raid5_mgr.c:4031 msgid "Do you really want to create a degraded array?" msgstr "" @@ -4621,17 +4621,17 @@ msgid "Add" msgstr "" -#: plugins/md/raid1_mgr.c:2821 plugins/md/raid5_mgr.c:5315 +#: plugins/md/raid1_mgr.c:2821 plugins/md/raid5_mgr.c:5311 msgid "Add spare to fix degraded array" msgstr "" -#: plugins/md/raid1_mgr.c:2823 plugins/md/raid5_mgr.c:5317 +#: plugins/md/raid1_mgr.c:2823 plugins/md/raid5_mgr.c:5313 msgid "" "Use this function to add a spare object to replace a missing or faulty entry " "of this degraded region." msgstr "" -#: plugins/md/raid1_mgr.c:2827 plugins/md/raid5_mgr.c:5322 +#: plugins/md/raid1_mgr.c:2827 plugins/md/raid5_mgr.c:5318 msgid "" "Use this function to add an object as a spare object for this RAID array." msgstr "" @@ -4645,11 +4645,11 @@ "Use this function to increase the number of mirrors for this RAID array." msgstr "" -#: plugins/md/raid1_mgr.c:2893 plugins/md/raid5_mgr.c:5251 +#: plugins/md/raid1_mgr.c:2893 plugins/md/raid5_mgr.c:5247 msgid "Remove spare object" msgstr "" -#: plugins/md/raid1_mgr.c:2896 plugins/md/raid5_mgr.c:5253 +#: plugins/md/raid1_mgr.c:2896 plugins/md/raid5_mgr.c:5249 msgid "Use this function to remove a spare object from this RAID array." msgstr "" @@ -4677,30 +4677,30 @@ msgid "Use this function to remove an active object from this RAID array." msgstr "" -#: plugins/md/raid1_mgr.c:3019 plugins/md/raid5_mgr.c:5352 +#: plugins/md/raid1_mgr.c:3019 plugins/md/raid5_mgr.c:5348 msgid "Remove a faulty object" msgstr "" -#: plugins/md/raid1_mgr.c:3022 plugins/md/raid5_mgr.c:5355 +#: plugins/md/raid1_mgr.c:3022 plugins/md/raid5_mgr.c:5351 msgid "" "Use this function to permanently remove a faulty object from this RAID array." msgstr "" -#: plugins/md/raid1_mgr.c:3049 plugins/md/raid5_mgr.c:5379 +#: plugins/md/raid1_mgr.c:3049 plugins/md/raid5_mgr.c:5375 msgid "Remove a stale object" msgstr "" -#: plugins/md/raid1_mgr.c:3052 plugins/md/raid5_mgr.c:5382 +#: plugins/md/raid1_mgr.c:3052 plugins/md/raid5_mgr.c:5378 msgid "" "Use this function to permanently remove a stale (possibly faulty) object " "from this RAID array." msgstr "" -#: plugins/md/raid1_mgr.c:3089 plugins/md/raid5_mgr.c:5415 +#: plugins/md/raid1_mgr.c:3089 plugins/md/raid5_mgr.c:5411 msgid "Mark object faulty" msgstr "" -#: plugins/md/raid1_mgr.c:3090 plugins/md/raid5_mgr.c:5416 +#: plugins/md/raid1_mgr.c:3090 plugins/md/raid5_mgr.c:5412 msgid "Mark faulty" msgstr "" @@ -4740,43 +4740,50 @@ msgid "A %s MD region requires a minimum of %d objects.\n" msgstr "" -#: plugins/md/raid5_mgr.c:3672 +#: plugins/md/raid5_mgr.c:3666 msgid "Size of the chunks in the RAID array" msgstr "" -#: plugins/md/raid5_mgr.c:3686 +#: plugins/md/raid5_mgr.c:3680 msgid "RAID Level -- RAID4 or RAID5" msgstr "" -#: plugins/md/raid5_mgr.c:3700 +#: plugins/md/raid5_mgr.c:3694 msgid "RAID5 Parity algorithm" msgstr "" -#: plugins/md/raid5_mgr.c:3701 +#: plugins/md/raid5_mgr.c:3695 msgid "RAID5 Algorithm" msgstr "" -#: plugins/md/raid5_mgr.c:4347 +#: plugins/md/raid5_mgr.c:4343 #, c-format msgid "" "At least one spare object must be left for recovering degraded array %s.\n" msgstr "" -#: plugins/md/raid5_mgr.c:5312 +#: plugins/md/raid5_mgr.c:5308 msgid "Add spare" msgstr "" -#: plugins/md/raid5_mgr.c:5320 +#: plugins/md/raid5_mgr.c:5316 msgid "Add spare object" msgstr "" -#: plugins/md/raid5_mgr.c:5417 +#: plugins/md/raid5_mgr.c:5413 msgid "" "Use this function to mark an object faulty in this RAID array. If the RAID " "array has a spare object, the spare object will be brought on-line to " "replace the faulty object." msgstr "" +#: plugins/md/raid5_mgr.c:5689 +#, c-format +msgid "" +"Array %s is running in degrade mode. At least one spare must be left for " +"the array to recover.\n" +msgstr "" + #: plugins/md/raid5_mgr.h:95 msgid "Left Asymmetric" msgstr ""