[GNUnet-SVN] r13894 - doodle/src/doodle

[gnunet]

Author: grothoff
Date: 2010-12-10 11:57:13 +0100 (Fri, 10 Dec 2010)
New Revision: 13894

Modified:
   doodle/src/doodle/doodle.c
   doodle/src/doodle/doodled.c
   doodle/src/doodle/getopt1.c
   doodle/src/doodle/index.c
   doodle/src/doodle/tree.c
Log:
i18nm

Modified: doodle/src/doodle/doodle.c
===================================================================
--- doodle/src/doodle/doodle.c  2010-12-09 11:30:49 UTC (rev 13893)
+++ doodle/src/doodle/doodle.c  2010-12-10 10:57:13 UTC (rev 13894)
@@ -63,11 +63,11 @@
  */
 static void printHelp () {
   static Help help[] = {
-    { 'a', "approximate", "DISTANCE",
+    { 'a', "approximate", gettext_noop ("DISTANCE"),
       gettext_noop("consider strings to match if DISTANCE letters are 
different") },
     { 'b', "build", NULL,
       gettext_noop("build database (default is to search)") },
-    { 'd', "database", "FILENAME",
+    { 'd', "database", gettext_noop ("FILENAME"),
       gettext_noop("use location FILENAME to store doodle database") },
     { 'e', "extract", NULL,
       gettext_noop("for each matching file, print the extracted keywords") },
@@ -77,9 +77,9 @@
       gettext_noop("print this help page") },
     { 'i', "ignore-case", NULL,
       gettext_noop("be case-insensitive (use when searching)") },
-    { 'l', "library", "LIBRARY",
+    { 'l', "library", gettext_noop ("LIBRARY"),
       gettext_noop("load an extractor plugin named LIBRARY") },
-    { 'L', "log", "FILENAME",
+    { 'L', "log", gettext_noop ("FILENAME"),
       gettext_noop("log keywords to a file named FILENAME") },
     { 'n', "nodefault", NULL,
       gettext_noop("do not load default set of extractor plugins") },

Modified: doodle/src/doodle/doodled.c
===================================================================
--- doodle/src/doodle/doodled.c 2010-12-09 11:30:49 UTC (rev 13893)
+++ doodle/src/doodle/doodled.c 2010-12-10 10:57:13 UTC (rev 13894)
@@ -500,7 +500,7 @@
     SEMAPHORE_DOWN(cls->signal);
     cls->log(cls->logContext,
             DOODLE_LOG_INSANELY_VERBOSE,
-            "Received signal to process fam event.\n");
+            _("Received signal to process fam event.\n"));
     MUTEX_LOCK(&cls->lock);
     if (cls->eventCount > 0) {
       fn = cls->events[cls->eventCount-1];
@@ -510,7 +510,7 @@
       more = cls->eventCount > 0;
       cls->log(cls->logContext,
               DOODLE_LOG_INSANELY_VERBOSE,
-              "Processing fam event '%s'.\n",
+              _("Processing fam event '%s'.\n"),
               fn);
     } else {
       fn = NULL;

Modified: doodle/src/doodle/getopt1.c
===================================================================
--- doodle/src/doodle/getopt1.c 2010-12-09 11:30:49 UTC (rev 13893)
+++ doodle/src/doodle/getopt1.c 2010-12-10 10:57:13 UTC (rev 13894)
@@ -89,96 +89,3 @@
 
 
 #endif /* Not ELIDE_CODE.  */
-
-#ifdef TEST
-
-#include <stdio.h>
-
-int
-main (argc, argv)
-     int argc;
-     char **argv;
-{
-  int c;
-  int digit_optind = 0;
-
-  while (1)
-    {
-      int this_option_optind = optind ? optind : 1;
-      int option_index = 0;
-      static struct option long_options[] = {
-       {"add", 1, 0, 0},
-       {"append", 0, 0, 0},
-       {"delete", 1, 0, 0},
-       {"verbose", 0, 0, 0},
-       {"create", 0, 0, 0},
-       {"file", 1, 0, 0},
-       {0, 0, 0, 0}
-      };
-
-      c = getopt_long (argc, argv, "abc:d:0123456789",
-                      long_options, &option_index);
-      if (c == -1)
-       break;
-
-      switch (c)
-       {
-       case 0:
-         printf ("option %s", long_options[option_index].name);
-         if (optarg)
-           printf (" with arg %s", optarg);
-         printf ("\n");
-         break;
-
-       case '0':
-       case '1':
-       case '2':
-       case '3':
-       case '4':
-       case '5':
-       case '6':
-       case '7':
-       case '8':
-       case '9':
-         if (digit_optind != 0 && digit_optind != this_option_optind)
-           printf ("digits occur in two different argv-elements.\n");
-         digit_optind = this_option_optind;
-         printf ("option %c\n", c);
-         break;
-
-       case 'a':
-         printf ("option a\n");
-         break;
-
-       case 'b':
-         printf ("option b\n");
-         break;
-
-       case 'c':
-         printf ("option c with value `%s'\n", optarg);
-         break;
-
-       case 'd':
-         printf ("option d with value `%s'\n", optarg);
-         break;
-
-       case '?':
-         break;
-
-       default:
-         printf ("?? getopt returned character code 0%o ??\n", c);
-       }
-    }
-
-  if (optind < argc)
-    {
-      printf ("non-option ARGV-elements: ");
-      while (optind < argc)
-       printf ("%s ", argv[optind++]);
-      printf ("\n");
-    }
-
-  exit (0);
-}
-
-#endif /* TEST */

Modified: doodle/src/doodle/index.c
===================================================================
--- doodle/src/doodle/index.c   2010-12-09 11:30:49 UTC (rev 13893)
+++ doodle/src/doodle/index.c   2010-12-10 10:57:13 UTC (rev 13894)
@@ -327,7 +327,7 @@
       return NULL;
   if (eproc->pid == -1)
     return NULL;
-  fprintf(stderr, "Processing file %s\n", filename);
+  fprintf(stderr, _("Processing file %s\n"), filename);
   head = NULL;
   pos = NULL;
   next = NULL;

Modified: doodle/src/doodle/tree.c
===================================================================
--- doodle/src/doodle/tree.c    2010-12-09 11:30:49 UTC (rev 13893)
+++ doodle/src/doodle/tree.c    2010-12-10 10:57:13 UTC (rev 13894)
@@ -2022,7 +2022,7 @@
                    tree->database))
       tree->log(tree->context,
                DOODLE_LOG_CRITICAL,
-               _("Could not rename temporary file '%s' to '%s: %s\n"),
+               _("Could not rename temporary file '%s' to '%s': %s\n"),
                tdatabase,
                tree->database,
                strerror(errno));