xfsprogs-gettext.patch

   1 --- xfsprogs-2.8.16/repair/progress.c.orig      2006-10-17 18:10:14.000000000 +0200
   2 +++ xfsprogs-2.8.16/repair/progress.c   2006-10-30 20:57:29.538997000 +0100
   3 @@ -10,33 +10,37 @@
   4  #define ONEDAY    (24*ONEHOUR)
   5  #define ONEWEEK   (7*ONEDAY)
   6
   7 +#ifndef N_
   8 +#define N_(x) x
   9 +#endif
  10 +
  11  static
  12  char *rpt_types[] = {
  13  #define TYPE_INODE     0
  14 -       _("inodes"),
  15 +       N_("inodes"),
  16  #define TYPE_BLOCK     1
  17 -       _("blocks"),
  18 +       N_("blocks"),
  19  #define TYPE_DIR       2
  20 -       _("directories"),
  21 +       N_("directories"),
  22  #define TYPE_AG                3
  23 -       _("allocation groups"),
  24 +       N_("allocation groups"),
  25  #define TYPE_AGI_BUCKET        4
  26 -       _("AGI unlinked buckets"),
  27 +       N_("AGI unlinked buckets"),
  28  #define TYPE_EXTENTS   5
  29 -       _("extents"),
  30 +       N_("extents"),
  31  #define TYPE_RTEXTENTS 6
  32 -       _("realtime extents"),
  33 +       N_("realtime extents"),
  34  #define TYPE_UNLINKED_LIST 7
  35 -       _("unlinked lists")
  36 +       N_("unlinked lists")
  37  };
  38
  39
  40  static
  41  char *rpt_fmts[] = {
  42  #define FMT1 0
  43 -_("        - %02d:%02d:%02d: %s - %llu of %llu %s done\n"),
  44 +N_("        - %02d:%02d:%02d: %s - %llu of %llu %s done\n"),
  45  #define FMT2 1
  46 -_("        - %02d:%02d:%02d: %s - %llu %s done\n"),
  47 +N_("        - %02d:%02d:%02d: %s - %llu %s done\n"),
  48  };
  49
  50  typedef struct progress_rpt_s {
  51 @@ -48,35 +52,35 @@
  52
  53  static
  54  progress_rpt_t progress_rpt_reports[] = {
  55 -{FMT1, _("scanning filesystem freespace"),                     /*  0 */
  56 +{FMT1, N_("scanning filesystem freespace"),                    /*  0 */
  57         &rpt_fmts[FMT1], &rpt_types[TYPE_AG]},
  58 -{FMT1, _("scanning agi unlinked lists"),                       /*  1 */
  59 +{FMT1, N_("scanning agi unlinked lists"),                      /*  1 */
  60         &rpt_fmts[FMT1], &rpt_types[TYPE_AG]},
  61 -{FMT2, _("check uncertain AG inodes"),                         /*  2 */
  62 +{FMT2, N_("check uncertain AG inodes"),                                /*  2 */
  63         &rpt_fmts[FMT2], &rpt_types[TYPE_AGI_BUCKET]},
  64 -{FMT1, _("process known inodes and inode discovery"),          /*  3 */
  65 +{FMT1, N_("process known inodes and inode discovery"),         /*  3 */
  66         &rpt_fmts[FMT1], &rpt_types[TYPE_INODE]},
  67 -{FMT1, _("process newly discovered inodes"),                   /*  4 */
  68 +{FMT1, N_("process newly discovered inodes"),                  /*  4 */
  69         &rpt_fmts[FMT1], &rpt_types[TYPE_AG]},
  70 -{FMT1, _("setting up duplicate extent list"),                  /*  5 */
  71 +{FMT1, N_("setting up duplicate extent list"),                 /*  5 */
  72         &rpt_fmts[FMT1], &rpt_types[TYPE_AG]},
  73 -{FMT1, _("initialize realtime bitmap"),                                /*  6 */
  74 +{FMT1, N_("initialize realtime bitmap"),                       /*  6 */
  75         &rpt_fmts[FMT1], &rpt_types[TYPE_BLOCK]},
  76 -{FMT1, _("reset realtime bitmaps"),                            /*  7 */
  77 +{FMT1, N_("reset realtime bitmaps"),                           /*  7 */
  78         &rpt_fmts[FMT1], &rpt_types[TYPE_AG]},
  79 -{FMT1, _("check for inodes claiming duplicate blocks"),                /*  8 */
  80 +{FMT1, N_("check for inodes claiming duplicate blocks"),       /*  8 */
  81         &rpt_fmts[FMT1], &rpt_types[TYPE_INODE]},
  82 -{FMT1, _("rebuild AG headers and trees"),                      /*  9 */
  83 +{FMT1, N_("rebuild AG headers and trees"),                     /*  9 */
  84         &rpt_fmts[FMT1], &rpt_types[TYPE_AG]},
  85 -{FMT1, _("traversing filesystem"),                             /* 10 */
  86 +{FMT1, N_("traversing filesystem"),                            /* 10 */
  87         &rpt_fmts[FMT1], &rpt_types[TYPE_AG]},
  88 -{FMT2, _("traversing all unattached subtrees"),                        /* 11 */
  89 +{FMT2, N_("traversing all unattached subtrees"),               /* 11 */
  90         &rpt_fmts[FMT2], &rpt_types[TYPE_DIR]},
  91 -{FMT2, _("moving disconnected inodes to lost+found"),          /* 12 */
  92 +{FMT2, N_("moving disconnected inodes to lost+found"),         /* 12 */
  93         &rpt_fmts[FMT2], &rpt_types[TYPE_INODE]},
  94 -{FMT1, _("verify and correct link counts"),                    /* 13 */
  95 +{FMT1, N_("verify and correct link counts"),                   /* 13 */
  96         &rpt_fmts[FMT1], &rpt_types[TYPE_INODE]},
  97 -{FMT1, _("verify link counts"),                                        /* 14 */
  98 +{FMT1, N_("verify link counts"),                               /* 14 */
  99         &rpt_fmts[FMT1], &rpt_types[TYPE_INODE]}
 100  };
 101
 102 @@ -339,16 +343,16 @@
 103         if (report_interval) {
 104                 switch(msgp->format->format) {
 105                 case FMT1:
 106 -                       sprintf (msgbuf, *msgp->format->fmt,
 107 +                       sprintf (msgbuf, _(*msgp->format->fmt),
 108                                 tmp->tm_hour, tmp->tm_min, tmp->tm_sec,
 109 -                               msgp->format->msg, sum,
 110 -                               *msgp->total, *msgp->format->type);
 111 +                               _(msgp->format->msg), sum,
 112 +                               *msgp->total, _(*msgp->format->type));
 113                         break;
 114                 case FMT2:
 115 -                       sprintf (msgbuf, *msgp->format->fmt,
 116 +                       sprintf (msgbuf, _(*msgp->format->fmt),
 117                                 tmp->tm_hour, tmp->tm_min, tmp->tm_sec,
 118 -                               msgp->format->msg, sum,
 119 -                               *msgp->format->type);
 120 +                               _(msgp->format->msg), sum,
 121 +                               _(*msgp->format->type));
 122                         break;
 123                 }
 124                 do_log(_("%s"), msgbuf);