diff -urN progsreiserfs-0.3.0.4.orig/progsreiserfs/cpfs.reiserfs/cpfs.reiserfs.c progsreiserfs-0.3.0.4/progsreiserfs/cpfs.reiserfs/cpfs.reiserfs.c --- progsreiserfs-0.3.0.4.orig/progsreiserfs/cpfs.reiserfs/cpfs.reiserfs.c 2002-05-05 19:53:44 +0300 +++ progsreiserfs-0.3.0.4/progsreiserfs/cpfs.reiserfs/cpfs.reiserfs.c 2008-08-19 01:51:05 +0300 @@ -63,6 +63,12 @@ {0, 0, 0, 0} }; +#ifdef ENABLE_NLS + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); +#endif + while ((choice = getopt_long_only(argc, argv, "uvj:nq", long_options, (int *)0)) != EOF) { @@ -175,7 +181,7 @@ choice = 'y'; if (!quiet) { if (!(choice = progs_user_choose("ynYN", _("Please select (y/n) "), - _("All data on %s will be lost. Do you realy want to copy " + _("All data on %s will be lost. Do you really want to copy " "%s to %s (y/n) "), dst_host_dev, src_host_dev, dst_host_dev))) goto error_free_dst_host_dal; } diff -urN progsreiserfs-0.3.0.4.orig/progsreiserfs/fsck.reiserfs/fsck.reiserfs.c progsreiserfs-0.3.0.4/progsreiserfs/fsck.reiserfs/fsck.reiserfs.c --- progsreiserfs-0.3.0.4.orig/progsreiserfs/fsck.reiserfs/fsck.reiserfs.c 2002-05-05 19:54:26 +0300 +++ progsreiserfs-0.3.0.4/progsreiserfs/fsck.reiserfs/fsck.reiserfs.c 2008-08-19 01:50:03 +0300 @@ -59,7 +59,7 @@ textdomain(PACKAGE); #endif - while ((choice = getopt_long_only(argc, argv, "uvj:n", + while ((choice = getopt_long_only(argc, argv, "uvj:nay", long_options, (int *)0)) != EOF) { switch (choice) { @@ -83,6 +83,14 @@ journal = 0; break; } + case 'a' : case 'y': { + /* Ignore these, they are simply for + * compatability with the boot process which + * calls all fsck with the -a and -y flags */ + libreiserfs_exception_throw(EXCEPTION_WARNING, EXCEPTION_UNHANDLED, + _("%s warning: option %c does nothing, ignored.\n"), argv[0]); + break; + } case '?': { fsck_print_usage(); return 0xfe; diff -urN progsreiserfs-0.3.0.4.orig/progsreiserfs/mkfs.reiserfs/mkfs.reiserfs.c progsreiserfs-0.3.0.4/progsreiserfs/mkfs.reiserfs/mkfs.reiserfs.c --- progsreiserfs-0.3.0.4.orig/progsreiserfs/mkfs.reiserfs/mkfs.reiserfs.c 2002-05-05 20:13:41 +0300 +++ progsreiserfs-0.3.0.4/progsreiserfs/mkfs.reiserfs/mkfs.reiserfs.c 2008-08-19 01:50:03 +0300 @@ -397,7 +397,7 @@ choice = 'y'; if (!quiet) { if (!(choice = progs_user_choose("ynYN", _("Please select (y/n) "), - _("All data on %s%s will be lost. Do you realy want to create %s " + _("All data on %s%s will be lost. Do you really want to create %s " "(y/n) "), host_dev, mess_part, reiserfs_fs_long_format_str(format)))) goto error_free_journal_dal; } diff -urN progsreiserfs-0.3.0.4.orig/progsreiserfs.m4 progsreiserfs-0.3.0.4/progsreiserfs.m4 --- progsreiserfs-0.3.0.4.orig/progsreiserfs.m4 2002-04-15 18:41:27 +0300 +++ progsreiserfs-0.3.0.4/progsreiserfs.m4 2008-08-19 01:50:03 +0300 @@ -10,7 +10,7 @@ dnl Adds the required libraries to $REISERFS_LIBS and does an dnl AC_SUBST(REISERFS_LIBS) -AC_DEFUN(AC_CHECK_LIBREISERFS, +AC_DEFUN([AC_CHECK_LIBREISERFS], [ dnl save LIBS