Remove gettext marks from debug messages.

Add translator comments for short statusbar messages.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1512 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 8fd64778019daaea7a5a815954455c0fa395d044..e17c6bf60cacf408ca768ac960c1e22672ae1e81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@ CVS code -
        - Change uncast nrealloc()s assigned to char pointers/arrays to
          charealloc()s, and cast all other nrealloc()s and all
          nmalloc()s. (David Benbennick and DLR)
+       - Remove gettext marks from all debug messages. Good for developers,
+         better for translators. (Jordi)
+       - Add translator comments on strings that should be short, like in
+         status bar strings, etc. (Jordi)
 - utils.c:
   align()
        - Tweak to avoid a potential problem when strp is non-NULL but

diff --git a/color.c b/color.c
index c2d0daa302799d043373f2560d40343f7969d02c..e8aacced41701a9486dc934f7a8cfd8e79c34166 100644 (file)
--- a/color.c
+++ b/color.c
@@ -91,7 +91,7 @@ void do_colorinit(void)
            init_pair(tmpcolor->pairnum, tmpcolor->fg, background);
 
 #ifdef DEBUG
-           fprintf(stderr, _("Running %s with fg = %d and bg = %d\n"),
+           fprintf(stderr, "Running %s with fg = %d and bg = %d\n",
                "init_pair()", tmpcolor->fg, tmpcolor->bg);
 #endif
        }

diff --git a/cut.c b/cut.c
index aca5929273edc99c9299c87a0209634be603dcc7..80af25ca5ab0798e6e03bcdeec6346b874f0d13a 100644 (file)
--- a/cut.c
+++ b/cut.c
@@ -46,7 +46,7 @@ filestruct *get_cutbottom(void)
 void add_to_cutbuffer(filestruct *inptr)
 {
 #ifdef DEBUG
-    fprintf(stderr, _("add_to_cutbuffer() called with inptr->data = %s\n"),
+    fprintf(stderr, "add_to_cutbuffer() called with inptr->data = %s\n",
            inptr->data);
 #endif
 
@@ -210,7 +210,7 @@ int do_cut_text(void)
        concatenate_cut = 0;
 #endif
 #ifdef DEBUG
-       fprintf(stderr, _("Blew away cutbuffer =)\n"));
+       fprintf(stderr, "Blew away cutbuffer =)\n");
 #endif
     }
 

diff --git a/files.c b/files.c
index 5e19c9fadb2df352577925f0191f43810f8df152..b70ed9461f01e3e155985f135f4d5ecb2c152d2d 100644 (file)
--- a/files.c
+++ b/files.c
@@ -476,7 +476,7 @@ int do_insertfile(int loading_file)
     if (i != -1) {
        inspath = mallocstrcpy(inspath, answer);
 #ifdef DEBUG
-       fprintf(stderr, _("filename is %s\n"), answer);
+       fprintf(stderr, "filename is %s\n", answer);
 #endif
 
 #ifndef NANO_SMALL
@@ -701,12 +701,12 @@ void free_openfilestruct(openfilestruct *src)
            src = src->next;
            delete_opennode(src->prev);
 #ifdef DEBUG
-           fprintf(stderr, _("%s: free'd a node, YAY!\n"), "delete_opennode()");
+           fprintf(stderr, "%s: free'd a node, YAY!\n", "delete_opennode()");
 #endif
        }
        delete_opennode(src);
 #ifdef DEBUG
-       fprintf(stderr, _("%s: free'd last node.\n"), "delete_opennode()");
+       fprintf(stderr, "%s: free'd last node.\n", "delete_opennode()");
 #endif
     }
 }
@@ -733,7 +733,7 @@ int add_open_file(int update)
           open_files and splice it in after the current one */
 
 #ifdef DEBUG
-       fprintf(stderr, _("filename is %s\n"), open_files->filename);
+       fprintf(stderr, "filename is %s\n", open_files->filename);
 #endif
 
        tmp = make_new_opennode(NULL);
@@ -790,7 +790,7 @@ int add_open_file(int update)
     }
 
 #ifdef DEBUG
-    fprintf(stderr, _("filename is %s\n"), open_files->filename);
+    fprintf(stderr, "filename is %s\n", open_files->filename);
 #endif
 
     return 0;
@@ -878,7 +878,7 @@ int open_prevfile(int closing_file)
        open_files = open_files->prev;
 
 #ifdef DEBUG
-       fprintf(stderr, _("filename is %s\n"), open_files->filename);
+       fprintf(stderr, "filename is %s\n", open_files->filename);
 #endif
 
     }
@@ -890,7 +890,7 @@ int open_prevfile(int closing_file)
            open_files = open_files->next;
 
 #ifdef DEBUG
-           fprintf(stderr, _("filename is %s\n"), open_files->filename);
+           fprintf(stderr, "filename is %s\n", open_files->filename);
 #endif
 
     }
@@ -941,7 +941,7 @@ int open_nextfile(int closing_file)
        open_files = open_files->next;
 
 #ifdef DEBUG
-       fprintf(stderr, _("filename is %s\n"), open_files->filename);
+       fprintf(stderr, "filename is %s\n", open_files->filename);
 #endif
 
     }
@@ -952,7 +952,7 @@ int open_nextfile(int closing_file)
            open_files = open_files->prev;
 
 #ifdef DEBUG
-           fprintf(stderr, _("filename is %s\n"), open_files->filename);
+           fprintf(stderr, "filename is %s\n", open_files->filename);
 #endif
 
        }
@@ -1398,7 +1398,7 @@ int write_file(const char *name, int tmp, int append, int nonamechange)
        }
 
 #ifdef DEBUG
-       fprintf(stderr, _("Backing up %s to %s\n"), realname, backupname);
+       fprintf(stderr, "Backing up %s to %s\n", realname, backupname);
 #endif
 
        /* copy the file */
@@ -1513,7 +1513,7 @@ int write_file(const char *name, int tmp, int append, int nonamechange)
        }
 #ifdef DEBUG
        else
-           fprintf(stderr, _("Wrote >%s\n"), fileptr->data);
+           fprintf(stderr, "Wrote >%s\n", fileptr->data);
 #endif
 #ifndef NANO_SMALL
        if (ISSET(DOS_FILE) || ISSET(MAC_FILE))
@@ -1812,7 +1812,7 @@ int do_writeout(const char *path, int exiting, int append)
        }
 
 #ifdef DEBUG
-       fprintf(stderr, _("filename is %s\n"), answer);
+       fprintf(stderr, "filename is %s\n", answer);
 #endif
 
 #ifdef NANO_EXTRA

diff --git a/global.c b/global.c
index 85f9750adc976dd8464b39a743b43d496a85d572..6c6ed4afe90dc58cadecbc7907b6fc716af2b914 100644 (file)
--- a/global.c
+++ b/global.c
@@ -414,32 +414,37 @@ void shortcut_init(int unjustify)
 #else
 #  define IFHELP(help, nextvar) help, nextvar
 #endif
-
+    /* Translators: try to keep this string under 10 characters long */
     sc_init_one(&main_list, NANO_HELP_KEY, _("Get Help"),
                IFHELP(nano_help_msg, 0), NANO_HELP_FKEY, 0, VIEW,
                do_help);
 
 #ifdef ENABLE_MULTIBUFFER
     if (open_files != NULL && (open_files->prev != NULL || open_files->next != NULL))
+    /* Translators: try to keep this string under 10 characters long */
        sc_init_one(&main_list, NANO_EXIT_KEY, _("Close"),
                IFHELP(nano_exit_msg, 0), NANO_EXIT_FKEY, 0, VIEW,
                do_exit);
     else
 #endif
 
+    /* Translators: try to keep this string under 10 characters long */
        sc_init_one(&main_list, NANO_EXIT_KEY, _("Exit"),
                IFHELP(nano_exit_msg, 0), NANO_EXIT_FKEY, 0, VIEW,
                do_exit);
 
+    /* Translators: try to keep this string under 10 characters long */
     sc_init_one(&main_list, NANO_WRITEOUT_KEY, _("WriteOut"),
                    IFHELP(nano_writeout_msg, 0),
                    NANO_WRITEOUT_FKEY, 0, NOVIEW, do_writeout_void);
 
+    /* Translators: try to keep this string under 10 characters long */
     sc_init_one(&main_list, NANO_JUSTIFY_KEY, _("Justify"),
                    IFHELP(nano_justify_msg, 0), NANO_JUSTIFY_FKEY, 0,
                    NOVIEW, do_justify);
 
     /* this is so we can view multiple files */
+    /* Translators: try to keep this string under 10 characters long */
     sc_init_one(&main_list, NANO_INSERTFILE_KEY, _("Read File"),
                IFHELP(nano_insert_msg, 0), NANO_INSERTFILE_FKEY, 0,
 #ifdef ENABLE_MULTIBUFFER
@@ -449,35 +454,43 @@ void shortcut_init(int unjustify)
 #endif
                , do_insertfile_void);
 
+    /* Translators: try to keep this string under 10 characters long */
     sc_init_one(&main_list, NANO_WHEREIS_KEY, _("Where Is"),
                IFHELP(nano_whereis_msg, 0),
                NANO_WHEREIS_FKEY, 0, VIEW, do_search);
 
+    /* Translators: try to keep this string under 10 characters long */
     sc_init_one(&main_list, NANO_PREVPAGE_KEY, _("Prev Page"),
                IFHELP(nano_prevpage_msg, 0),
                NANO_PREVPAGE_FKEY, KEY_PPAGE, VIEW, do_page_up);
 
+    /* Translators: try to keep this string under 10 characters long */
     sc_init_one(&main_list, NANO_NEXTPAGE_KEY, _("Next Page"),
                IFHELP(nano_nextpage_msg, 0),
                NANO_NEXTPAGE_FKEY, KEY_NPAGE, VIEW, do_page_down);
 
+    /* Translators: try to keep this string under 10 characters long */
     sc_init_one(&main_list, NANO_CUT_KEY, _("Cut Text"),
                IFHELP(nano_cut_msg, 0),
                NANO_CUT_FKEY, 0, NOVIEW, do_cut_text);
 
     if (unjustify)
+    /* Translators: try to keep this string under 10 characters long */
        sc_init_one(&main_list, NANO_UNJUSTIFY_KEY, _("UnJustify"),
                IFHELP(nano_unjustify_msg, 0),
                0, 0, NOVIEW, do_uncut_text);
     else
+    /* Translators: try to keep this string under 10 characters long */
        sc_init_one(&main_list, NANO_UNCUT_KEY, _("UnCut Txt"),
                IFHELP(nano_uncut_msg, 0),
                NANO_UNCUT_FKEY, 0, NOVIEW, do_uncut_text);
 
+    /* Translators: try to keep this string under 10 characters long */
     sc_init_one(&main_list, NANO_CURSORPOS_KEY, _("Cur Pos"),
                IFHELP(nano_cursorpos_msg, 0),
                NANO_CURSORPOS_FKEY, 0, VIEW, do_cursorpos_void);
 
+    /* Translators: try to keep this string under 10 characters long */
     sc_init_one(&main_list, NANO_SPELL_KEY, _("To Spell"),
                IFHELP(nano_spell_msg, 0),
                NANO_SPELL_FKEY, 0, NOVIEW, do_spell);
@@ -565,35 +578,44 @@ void shortcut_init(int unjustify)
     sc_init_one(&whereis_list, NANO_HELP_KEY, _("Get Help"),
                IFHELP(nano_help_msg, 0), 0, 0, VIEW, do_help);
 
+    /* Translators: try to keep this string under 12 characters long */
     sc_init_one(&whereis_list, NANO_CANCEL_KEY, _("Cancel"),
                IFHELP(nano_cancel_msg, 0), 0, 0, VIEW, 0);
 
+    /* Translators: try to keep this string under 12 characters long */
     sc_init_one(&whereis_list, NANO_FIRSTLINE_KEY, _("First Line"),
                IFHELP(nano_firstline_msg, 0),
                0, 0, VIEW, do_first_line);
 
+    /* Translators: try to keep this string under 12 characters long */
     sc_init_one(&whereis_list, NANO_LASTLINE_KEY, _("Last Line"),
                IFHELP(nano_lastline_msg, 0), 0, 0, VIEW, do_last_line);
 
+    /* Translators: try to keep this string under 12 characters long */
     sc_init_one(&whereis_list, NANO_OTHERSEARCH_KEY, _("Replace"),
                IFHELP(nano_replace_msg, 0), 0, 0, VIEW, do_replace);
 
+    /* Translators: try to keep this string under 12 characters long */
     sc_init_one(&whereis_list, NANO_FROMSEARCHTOGOTO_KEY, _("Go To Line"),
                IFHELP(nano_goto_msg, 0), 0, 0, VIEW, do_gotoline_void);
 
 #ifndef NANO_SMALL
+    /* Translators: try to keep this string under 12 characters long */
     sc_init_one(&whereis_list, TOGGLE_CASE_KEY, _("Case Sens"),
                IFHELP(nano_case_msg, 0), 0, 0, VIEW, 0);
 
+    /* Translators: try to keep this string under 12 characters long */
     sc_init_one(&whereis_list, TOGGLE_BACKWARDS_KEY, _("Direction"),
                IFHELP(nano_reverse_msg, 0), 0, 0, VIEW, 0);
 
 #ifdef HAVE_REGEX_H
+    /* Translators: try to keep this string under 12 characters long */
     sc_init_one(&whereis_list, TOGGLE_REGEXP_KEY, _("Regexp"),
                IFHELP(nano_regexp_msg, 0), 0, 0, VIEW, 0);
 #endif
 
 #ifndef NANO_SMALL
+    /* Translators: try to keep this string under 12 characters long */
     sc_init_one(&whereis_list, KEY_UP, _("History"),
                IFHELP(nano_editstr_msg, 0), NANO_UP_KEY, 0, VIEW, 0);
 #endif
@@ -614,6 +636,7 @@ void shortcut_init(int unjustify)
     sc_init_one(&replace_list, NANO_LASTLINE_KEY, _("Last Line"),
                IFHELP(nano_lastline_msg, 0), 0, 0, VIEW, do_last_line);
 
+    /* Translators: try to keep this string under 12 characters long */
     sc_init_one(&replace_list, NANO_OTHERSEARCH_KEY, _("No Replace"),
                IFHELP(nano_whereis_msg, 0), 0, 0, VIEW, do_search);
 
@@ -691,25 +714,31 @@ void shortcut_init(int unjustify)
                IFHELP(nano_help_msg, 0), 0, 0, VIEW, do_help);
 
 #ifndef DISABLE_BROWSER
+    /* Translators: try to keep this string under 16 characters long */
     sc_init_one(&writefile_list, NANO_TOFILES_KEY, _("To Files"),
                IFHELP(nano_tofiles_msg, 0), 0, 0, NOVIEW, 0);
 #endif
 
 #ifndef NANO_SMALL
+    /* Translators: try to keep this string under 16 characters long */
     sc_init_one(&writefile_list, TOGGLE_DOS_KEY, _("DOS Format"),
                IFHELP(nano_dos_msg, 0), 0, 0, NOVIEW, 0);
 
+    /* Translators: try to keep this string under 16 characters long */
     sc_init_one(&writefile_list, TOGGLE_MAC_KEY, _("Mac Format"),
                IFHELP(nano_mac_msg, 0), 0, 0, NOVIEW, 0);
 #endif
 
+    /* Translators: try to keep this string under 16 characters long */
     sc_init_one(&writefile_list, NANO_APPEND_KEY, _("Append"),
                IFHELP(nano_append_msg, 0), 0, 0, NOVIEW, 0);
 
+    /* Translators: try to keep this string under 16 characters long */
     sc_init_one(&writefile_list, NANO_PREPEND_KEY, _("Prepend"),
                IFHELP(nano_prepend_msg, 0), 0, 0, NOVIEW, 0);
 
 #ifndef NANO_SMALL
+    /* Translators: try to keep this string under 16 characters long */
     sc_init_one(&writefile_list, TOGGLE_BACKUP_KEY, _("Backup File"),
                IFHELP(nano_backup_msg, 0), 0, 0, NOVIEW, 0);
 #endif
@@ -730,9 +759,11 @@ void shortcut_init(int unjustify)
                IFHELP(nano_tofiles_msg, 0), 0, 0, NOVIEW, 0);
 #endif
 #ifndef NANO_SMALL
+    /* Translators: try to keep this string under 22 characters long */
     sc_init_one(&insertfile_list, NANO_EXTCMD_KEY, _("Execute Command"),
                IFHELP(nano_execute_msg, 0), 0, 0, NOVIEW, 0);
 #ifdef ENABLE_MULTIBUFFER
+    /* Translators: try to keep this string under 22 characters long */
     sc_init_one(&insertfile_list, TOGGLE_LOAD_KEY, _("New Buffer"),
                IFHELP(nano_multibuffer_msg, 0), 0, 0, NOVIEW, 0);
 #endif
@@ -775,6 +806,7 @@ void shortcut_init(int unjustify)
                IFHELP(nano_nextpage_msg, 0), NANO_NEXTPAGE_FKEY,
                KEY_NPAGE, VIEW, 0);
 
+    /* Translators: try to keep this string under 22 characters long */
     sc_init_one(&browser_list, NANO_GOTO_KEY, _("Go To Dir"),
                IFHELP(nano_gotodir_msg, NANO_ALT_GOTO_KEY),
                NANO_GOTO_FKEY, 0, VIEW, 0);

diff --git a/nano.c b/nano.c
index 7ac4c5237434b22a7f0dbb2a14b631859a0f4a04..1cb3aedc35591d9245a0a7e93905caad1480e6b1 100644 (file)
--- a/nano.c
+++ b/nano.c
@@ -562,12 +562,12 @@ void free_filestruct(filestruct *src)
            src = src->next;
            delete_node(src->prev);
 #ifdef DEBUG
-           fprintf(stderr, _("%s: free'd a node, YAY!\n"), "delete_node()");
+           fprintf(stderr, "%s: free'd a node, YAY!\n", "delete_node()");
 #endif
        }
        delete_node(src);
 #ifdef DEBUG
-       fprintf(stderr, _("%s: free'd last node.\n"), "delete_node()");
+       fprintf(stderr, "%s: free'd last node.\n", "delete_node()");
 #endif
     }
 }
@@ -1029,7 +1029,7 @@ int do_backspace(void)
        memmove(&current->data[current_x - 1], &current->data[current_x],
                strlen(current->data) - current_x + 1);
 #ifdef DEBUG
-       fprintf(stderr, _("current->data now = \"%s\"\n"), current->data);
+       fprintf(stderr, "current->data now = \"%s\"\n", current->data);
 #endif
        align(&current->data);
 #ifndef NANO_SMALL
@@ -1089,7 +1089,7 @@ int do_backspace(void)
            current_y--;
        totlines--;
 #ifdef DEBUG
-       fprintf(stderr, _("After, data = \"%s\"\n"), current->data);
+       fprintf(stderr, "After, data = \"%s\"\n", current->data);
 #endif
        refresh = 1;
     }
@@ -3381,7 +3381,7 @@ int main(int argc, char *argv[])
     signal_init();
 
 #ifdef DEBUG
-    fprintf(stderr, _("Main: set up windows\n"));
+    fprintf(stderr, "Main: set up windows\n");
 #endif
 
     window_init();
@@ -3395,13 +3395,13 @@ int main(int argc, char *argv[])
     }
 
 #ifdef DEBUG
-    fprintf(stderr, _("Main: bottom win\n"));
+    fprintf(stderr, "Main: bottom win\n");
 #endif
     /* Set up bottom of window */
     display_main_list();
 
 #ifdef DEBUG
-    fprintf(stderr, _("Main: open file\n"));
+    fprintf(stderr, "Main: open file\n");
 #endif
 
     open_file(filename, 0, 1);
@@ -3458,7 +3458,7 @@ int main(int argc, char *argv[])
 
        kbinput = wgetch(edit);
 #ifdef DEBUG
-       fprintf(stderr, _("AHA!  %c (%d)\n"), kbinput, kbinput);
+       fprintf(stderr, "AHA!  %c (%d)\n", kbinput, kbinput);
 #endif
        if (kbinput == 27) {    /* Grab Alt-key stuff first */
            kbinput = wgetch(edit);
@@ -3478,7 +3478,7 @@ int main(int argc, char *argv[])
                    kbinput = KEY_F(kbinput - 79);
 #ifdef DEBUG
                else {
-                   fprintf(stderr, _("I got Alt-O-%c! (%d)\n"),
+                   fprintf(stderr, "I got Alt-O-%c! (%d)\n",
                            kbinput, kbinput);
                    break;
                }
@@ -3505,7 +3505,7 @@ int main(int argc, char *argv[])
                        kbinput = KEY_HOME;
 #ifdef DEBUG
                    else {
-                       fprintf(stderr, _("I got Alt-[-1-%c! (%d)\n"),
+                       fprintf(stderr, "I got Alt-[-1-%c! (%d)\n",
                                kbinput, kbinput);
                        break;
                    }
@@ -3535,7 +3535,7 @@ int main(int argc, char *argv[])
                        break;
 #ifdef DEBUG
                    default:
-                       fprintf(stderr, _("I got Alt-[-2-%c! (%d)\n"),
+                       fprintf(stderr, "I got Alt-[-2-%c! (%d)\n",
                                kbinput, kbinput);
                        break;
 #endif
@@ -3604,7 +3604,7 @@ int main(int argc, char *argv[])
                    break;
                default:
 #ifdef DEBUG
-                   fprintf(stderr, _("I got Alt-[-%c! (%d)\n"),
+                   fprintf(stderr, "I got Alt-[-%c! (%d)\n",
                            kbinput, kbinput);
 #endif
                    break;
@@ -3650,7 +3650,7 @@ int main(int argc, char *argv[])
                        }
 #endif
 #ifdef DEBUG
-               fprintf(stderr, _("I got Alt-%c! (%d)\n"), kbinput,
+               fprintf(stderr, "I got Alt-%c! (%d)\n", kbinput,
                        kbinput);
 #endif
                break;
@@ -3749,7 +3749,7 @@ int main(int argc, char *argv[])
                break;
            default:
 #ifdef DEBUG
-               fprintf(stderr, _("I got %c (%d)!\n"), kbinput, kbinput);
+               fprintf(stderr, "I got %c (%d)!\n", kbinput, kbinput);
 #endif
                /* We no longer stop unhandled sequences so that people with
                   odd character sets can type... */

diff --git a/rcfile.c b/rcfile.c
index f0e09dec0b7b2d32c77f026dde32b9fcb667b065..cbdd52b68bb398b0886cca44de54f49bcaa290d5 100644 (file)
--- a/rcfile.c
+++ b/rcfile.c
@@ -295,7 +295,7 @@ void parse_syntax(char *ptr)
        tmpsyntax->next = (syntaxtype *)nmalloc(sizeof(syntaxtype));
        tmpsyntax = tmpsyntax->next;
 #ifdef DEBUG
-       fprintf(stderr, _("Adding new syntax after 1st\n"));
+       fprintf(stderr, "Adding new syntax after 1st\n");
 #endif
     }
     tmpsyntax->desc = mallocstrcpy(NULL, nameptr);
@@ -303,7 +303,7 @@ void parse_syntax(char *ptr)
     tmpsyntax->extensions = NULL;
     tmpsyntax->next = NULL;
 #ifdef DEBUG
-    fprintf(stderr, _("Starting a new syntax type\n"));
+    fprintf(stderr, "Starting a new syntax type\n");
     fprintf(stderr, "string val=%s\n", nameptr);
 #endif
 
@@ -417,7 +417,7 @@ void parse_colors(char *ptr)
            if (tmpsyntax->color == NULL) {
                tmpsyntax->color = newcolor;
 #ifdef DEBUG
-               fprintf(stderr, _("Starting a new colorstring for fg %d bg %d\n"),
+               fprintf(stderr, "Starting a new colorstring for fg %d bg %d\n",
                        fg, bg);
 #endif
            } else {
@@ -425,7 +425,7 @@ void parse_colors(char *ptr)
                        tmpcolor = tmpcolor->next)
                    ;
 #ifdef DEBUG
-               fprintf(stderr, _("Adding new entry for fg %d bg %d\n"), fg, bg);
+               fprintf(stderr, "Adding new entry for fg %d bg %d\n", fg, bg);
 #endif
                tmpcolor->next = newcolor;
            }
@@ -483,7 +483,7 @@ void parse_rcfile(FILE *rcstream)
 
        if (*ptr == '#') {
 #ifdef DEBUG
-           fprintf(stderr, _("%s: Read a comment\n"), "parse_rcfile()");
+           fprintf(stderr, "%s: Read a comment\n", "parse_rcfile()");
 #endif
            continue;           /* Skip past commented lines */
        }
@@ -518,7 +518,7 @@ void parse_rcfile(FILE *rcstream)
            for (i = 0; rcopts[i].name != NULL; i++) {
                if (!strcasecmp(option, rcopts[i].name)) {
 #ifdef DEBUG
-                   fprintf(stderr, _("%s: Parsing option %s\n"), 
+                   fprintf(stderr, "%s: Parsing option %s\n", 
                            "parse_rcfile()", rcopts[i].name);
 #endif
                    if (set == 1) {
@@ -595,13 +595,13 @@ void parse_rcfile(FILE *rcstream)
                        } else
                            SET(rcopts[i].flag);
 #ifdef DEBUG
-                       fprintf(stderr, _("set flag %d!\n"),
+                       fprintf(stderr, "set flag %d!\n",
                                rcopts[i].flag);
 #endif
                    } else {
                        UNSET(rcopts[i].flag);
 #ifdef DEBUG
-                       fprintf(stderr, _("unset flag %d!\n"),
+                       fprintf(stderr, "unset flag %d!\n",
                                rcopts[i].flag);
 #endif
                    }

diff --git a/winio.c b/winio.c
index a15dd1728f0cb88dbf079603fe4c1678c8e72e3a..c699128a47909e69f62b82129cdacf24ddd505de 100644 (file)
--- a/winio.c
+++ b/winio.c
@@ -87,7 +87,7 @@ size_t actual_x(const filestruct *fileptr, size_t xplus)
        i--;
 
 #ifdef DEBUG
-    fprintf(stderr, _("actual_x for xplus=%d returns %d\n"), xplus, i);
+    fprintf(stderr, "actual_x for xplus=%d returns %d\n", xplus, i);
 #endif
 
     return i;
@@ -250,7 +250,7 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
     while ((kbinput = wgetch(bottomwin)) != 13) {
        for (t = s; t != NULL; t = t->next) {
 #ifdef DEBUG
-           fprintf(stderr, _("Aha! \'%c\' (%d)\n"), kbinput, kbinput);
+           fprintf(stderr, "Aha! \'%c\' (%d)\n", kbinput, kbinput);
 #endif
 
            if (kbinput == t->val && kbinput < 32) {
@@ -518,7 +518,7 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
 
                for (t = s; t != NULL; t = t->next) {
 #ifdef DEBUG
-                   fprintf(stderr, _("Aha! \'%c\' (%d)\n"), kbinput,
+                   fprintf(stderr, "Aha! \'%c\' (%d)\n", kbinput,
                            kbinput);
 #endif
                    if (kbinput == t->val || kbinput == t->val - 32)
@@ -541,7 +541,7 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
            x++;
 
 #ifdef DEBUG
-           fprintf(stderr, _("input \'%c\' (%d)\n"), kbinput, kbinput);
+           fprintf(stderr, "input \'%c\' (%d)\n", kbinput, kbinput);
 #endif
        } /* switch (kbinput) */
 #ifndef NANO_SMALL
@@ -1109,7 +1109,7 @@ void update_cursor(void)
     int i = 0;
 
 #ifdef DEBUG
-    fprintf(stderr, _("Moved to (%d, %d) in edit buffer\n"), current_y,
+    fprintf(stderr, "Moved to (%d, %d) in edit buffer\n", current_y,
            current_x);
 #endif
 
@@ -1260,7 +1260,7 @@ int statusq(int tabs, const shortcut *s, const char *def,
     blank_statusbar();
 
 #ifdef DEBUG
-    fprintf(stderr, _("I got \"%s\"\n"), answer);
+    fprintf(stderr, "I got \"%s\"\n", answer);
 #endif
 
 #ifndef DISABLE_TABCOMP
@@ -1747,11 +1747,11 @@ void fix_editbot(void)
 /* Dump the current file structure to stderr */
 void dump_buffer(const filestruct *inptr) {
     if (inptr == fileage)
-       fprintf(stderr, _("Dumping file buffer to stderr...\n"));
+       fprintf(stderr, "Dumping file buffer to stderr...\n");
     else if (inptr == cutbuffer)
-       fprintf(stderr, _("Dumping cutbuffer to stderr...\n"));
+       fprintf(stderr, "Dumping cutbuffer to stderr...\n");
     else
-       fprintf(stderr, _("Dumping a buffer to stderr...\n"));
+       fprintf(stderr, "Dumping a buffer to stderr...\n");
 
     while (inptr != NULL) {
        fprintf(stderr, "(%d) %s\n", inptr->lineno, inptr->data);