9 files changed, 149 insertions, 131 deletions

diff --git a/src/graph.c b/src/graph.c
index bfd00cb..1464e8b 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -53,8 +53,9 @@ 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])
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
@@ -112,9 +112,9 @@ expr  : 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
             {
@@ -144,14 +144,14 @@ expr  : 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
             {
@@ -166,14 +166,14 @@ expr  : 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
             {
@@ -188,19 +188,19 @@ expr  : 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
             {
@@ -214,9 +214,9 @@ expr  : value
           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
             {
@@ -229,9 +229,9 @@ expr  : value
           if ($2.type == unspecified_value)
             init_value (&$$, unspecified_value, NULL);
           else if ($2.type == string_value)
             {
-              yyerror ("unary plus not defined for strings");
+              yyerror (_("unary plus not defined for strings"));
               init_value (&$$, unspecified_value, NULL);
             }
           else
             {
@@ -272,9 +272,9 @@ create_html (pp_tab_t *tab, char *file, char *dest)
   
   tmp_file = fopen (tmp_file_name, "w");
   if (!tmp_file)
     {
-      logmsg (L_ERR, "cannot open output file `%s': %s",
+      logmsg (L_ERR, _("cannot open output file `%s': %s"),
              file, strerror (errno));
       html_close ();
       return 1;
     }
@@ -285,16 +285,16 @@ create_html (pp_tab_t *tab, char *file, char *dest)
   if (rc == 0)
     {
       if (unlink (dest) && errno != ENOENT)
         {
-          logmsg (L_ERR, "cannot unlink file `%s': %s",
+          logmsg (L_ERR, _("cannot unlink file `%s': %s"),
                  dest, strerror (errno));
           rc = 1;
         }
 
       if (rename (tmp_file_name, dest))
         {
-          logmsg (L_ERR, "cannot rename `%s' to `%s': %s",
+          logmsg (L_ERR, _("cannot rename `%s' to `%s': %s"),
                   tmp_file_name, dest,
                   strerror (errno));
           rc = 1;
         }
@@ -493,18 +493,18 @@ read_symtab (pp_tab_t **tab, const char *name)
       p = buf;
       cmd = *p++;
       if (*p != ' ' || !(isascii (*++p) && isalpha (*p)))
         {
-          logmsg (L_ERR, "%s:%u: invalid input: %s",
+          logmsg (L_ERR, _("%s:%u: invalid input: %s"),
                   name, line, buf);
           status = 1;
           break;
         }
       var = p;
       p = strchr (var, ' ');
       if (!p)
         {
-          logmsg (L_ERR, "%s:%u: invalid input: %s",
+          logmsg (L_ERR, _("%s:%u: invalid input: %s"),
                   name, line, buf);
           status = 1;
           break;
         }
@@ -522,9 +522,9 @@ read_symtab (pp_tab_t **tab, const char *name)
             char *p;
             double num = strtod (value, &p);
             if (*p)
               {
-                logmsg (L_ERR, "%s:%u: invalid numeric value: %s",
+                logmsg (L_ERR, _("%s:%u: invalid numeric value: %s"),
                         name, line, value);
                 status = 1;
               }
             else
@@ -532,9 +532,9 @@ read_symtab (pp_tab_t **tab, const char *name)
           }
           break;
 
         default:
-          logmsg (L_NOTICE, "%s:%u: ignoring unknown command %#03o",
+          logmsg (L_NOTICE, _("%s:%u: ignoring unknown command %#03o"),
                   name, line, cmd);
         }
     }
   free (buf);
diff --git a/src/html.lex.l b/src/html.lex.l
index 931bfc1..0e0d423 100644
--- a/src/html.lex.l
+++ b/src/html.l