10 files changed, 167 insertions, 131 deletions

diff --git a/configure.ac b/configure.ac
index a622998..70e0c79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,16 +70,34 @@ AC_CHECK_LIB([gd],[gdImageCreate],
 AC_CHECK_HEADERS(gdbm.h,
                  ,
                  [AC_MSG_ERROR([gdbm.h not found])])
              
 AC_CHECK_LIB([gdbm], [gdbm_open],
              ,
              [AC_MSG_ERROR([libgdbm not found])])
 
+## Default syslog facility
+LOG_FACILITY="LOG_DAEMON"
+
+AC_ARG_VAR([LOG_FACILITY],
+           [Default syslog facility])
+if test -n "$LOG_FACILITY"; then
+   logfacility=`echo $LOG_FACILITY | tr a-z A-Z`
+   case $logfacility in
+   USER|DAEMON|AUTH|AUTHPRIV|MAIL|CRON|LOCAL[[0-7]])
+      LOG_FACILITY=LOG_$logfacility;;
+   LOG_USER|LOG_DAEMON|LOG_AUTH|LOG_AUTHPRIV|LOG_MAIL|LOG_CRON|LOG_LOCAL[[0-7]])
+      LOG_FACILITY=$logfacility;;
+   *) AC_MSG_ERROR([Invalid value of LOG_FACILITY]);;
+   esac
+fi                    
+AC_DEFINE_UNQUOTED([LOG_FACILITY],$LOG_FACILITY,
+                   [Default syslog facility.])
+             
 AC_CONFIG_FILES([Makefile
                  gnu/Makefile
                  grecs/Makefile
                  grecs/src/Makefile
                  src/Makefile
                  etc/Makefile])
                           
 AC_OUTPUT
diff --git a/src/graph.c b/src/graph.c
index bfd00cb..1464e8b 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -49,16 +49,17 @@ int color_out_max[3]       = { 255,0,255 };
 int color_percent[3]       = { 239,159,79 };
 
 int graph_xsize = 460;
 int graph_ysize = 100;
 
 int graph_h_margin[2] = { 100, 14 };
 int graph_v_margin[2] = { 14, 35 };
 
+/* FIXME: I18N?? */
 char *rate_unit = "Bytes per Second";
 
 #define make_color_index(g, ar) \
   gdImageColorAllocate (g, (ar)[0], (ar)[1], (ar)[2])
 
 static void
 draw_vtext (gdImagePtr graph, int color, const char *text)
 {
diff --git a/src/html.gram.y b/src/html.gram.y
index fae64ff..e488494 100644
--- a/src/html.gram.y
+++ b/src/html.gram.y
@@ -108,17 +108,17 @@ expr  : value
         }
       | expr '+' expr
         {
           if ($1.type == unspecified_value
               || $3.type == unspecified_value)
             init_value (&$$, unspecified_value, NULL);
           else if ($1.type != $3.type)
             {
-              yyerror ("type mismatch in addition");
+              yyerror (_("type mismatch in addition"));
               init_value (&$$, unspecified_value, NULL);
             }
           else
             {
               $$.type = $1.type;
               deduce_format (&$$, &$1, &$3);
               switch ($1.type)
                 {
@@ -140,102 +140,102 @@ expr  : value
         }
       | expr '-' expr
         {
           if ($1.type == unspecified_value
               || $3.type == unspecified_value)
             init_value (&$$, unspecified_value, NULL);
           else if ($1.type != $3.type)
             {
-              yyerror ("type mismatch in subtraction");
+              yyerror (_("type mismatch in subtraction"));
               init_value (&$$, unspecified_value, NULL);
             }
           else if ($1.type == string_value)
             {
-              yyerror ("subtraction not defined for strings");
+              yyerror (_("subtraction not defined for strings"));
               init_value (&$$, unspecified_value, NULL);
             }
           else
             {
               $$.type = $1.type;
               deduce_format (&$$, &$1, &$3);
               $$.v.number = $1.v.number - $3.v.number;
             }
         }
       | expr '*' expr
         {
           if ($1.type == unspecified_value
               || $3.type == unspecified_value)
             init_value (&$$, unspecified_value, NULL);
           else if ($1.type != $3.type)
             {
-              yyerror ("type mismatch in multiplication");
+              yyerror (_("type mismatch in multiplication"));
               init_value (&$$, unspecified_value, NULL);
             }
           else if ($1.type == string_value)
             {
-              yyerror ("multiplication not defined for strings");
+              yyerror (_("multiplication not defined for strings"));
               init_value (&$$, unspecified_value, NULL);
             }
           else
             {
               $$.type = $1.type;
               deduce_format (&$$, &$1, &$3);
               $$.v.number = $1.v.number * $3.v.number;
             }
         }
       | expr '/' expr
         {
           if ($1.type == unspecified_value
               || $3.type == unspecified_value)
             init_value (&$$, unspecified_value, NULL);
           else if ($1.type != $3.type)
             {
-              yyerror ("type mismatch in division");
+              yyerror (_("type mismatch in division"));
               init_value (&$$, unspecified_value, NULL);
             }
           else if ($1.type == string_value)
             {
-              yyerror ("division not defined for strings");
+              yyerror (_("division not defined for strings"));
               init_value (&$$, unspecified_value, NULL);
             }
           else if (fabs ($3.v.number) < 1.0e-5)
             {
-              yyerror ("division by zero");
+              yyerror (_("division by zero"));
               init_value (&$$, unspecified_value, NULL);
             }
           else
             {
               $$.type = $1.type;
               deduce_format (&$$, &$1, &$3);
               $$.v.number = $1.v.number / $3.v.number;
             }
         }
       | '-' expr %prec UMINUS
         {
           if ($2.type == unspecified_value) 
             init_value (&$$, unspecified_value, NULL);
           else if ($2.type == string_value)
             {
-              yyerror ("unary minus not defined for strings");
+              yyerror (_("unary minus not defined for strings"));
               init_value (&$$, unspecified_value, NULL);
             }
           else
             {
               $$ = $2;
               $$.v.number = - $2.v.number;