From abe307380dc6661d85d72335416392c11ee92d4c Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Wed, 10 Apr 2002 23:39:40 +0000 Subject: _() i18n macro added to all strings missing it --- mixgtk/gmixvm.c | 4 ++-- mixgtk/mixgtk.c | 14 +++++++------- mixgtk/mixgtk_device.c | 4 ++-- mixgtk/mixgtk_gen_handlers.c | 10 +++++----- mixgtk/mixgtk_mixal.c | 4 ++-- mixgtk/mixgtk_mixvm.c | 13 +++++++------ mixguile/mixguile.c | 6 +++--- mixlib/mix.c | 8 ++++---- mixlib/mix_config.c | 6 +++--- mixlib/mix_predicate.c | 16 ++++++++-------- mixlib/mix_vm_command.c | 4 ++-- mixutils/mixvm_command.c | 4 ++-- 12 files changed, 47 insertions(+), 46 deletions(-) diff --git a/mixgtk/gmixvm.c b/mixgtk/gmixvm.c index 75b2f88..382601b 100644 --- a/mixgtk/gmixvm.c +++ b/mixgtk/gmixvm.c @@ -1,7 +1,7 @@ /* -*-c-*- -------------- gmixvm.c : * Main function of the mix gtk front-end * ------------------------------------------------------------------ - * $Id: gmixvm.c,v 1.4 2002/03/29 16:30:49 jao Exp $ + * $Id: gmixvm.c,v 1.5 2002/04/10 23:39:40 jao Exp $ * ------------------------------------------------------------------ * Copyright (C) 2001, 2002 Free Software Foundation, Inc. * @@ -94,7 +94,7 @@ main(int argc, char *argv[]) switch (c) { case VER_OPT: - mix_print_license ("gmixvm, GTK MIX virtual machine"); + mix_print_license (_("gmixvm, GTK MIX virtual machine")); return EXIT_SUCCESS; case NOINIT_OPT: initfile_ = FALSE; diff --git a/mixgtk/mixgtk.c b/mixgtk/mixgtk.c index ee1c213..7cad87a 100644 --- a/mixgtk/mixgtk.c +++ b/mixgtk/mixgtk.c @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk.c : * Main functions of the mix gtk front-end * ------------------------------------------------------------------ - * $Id: mixgtk.c,v 1.14 2002/03/29 16:31:46 jao Exp $ + * $Id: mixgtk.c,v 1.15 2002/04/10 23:39:40 jao Exp $ * ------------------------------------------------------------------ * Copyright (C) 2001, 2002 Free Software Foundation, Inc. * @@ -46,7 +46,7 @@ mixgtk_restart (void) if (!mixgtk_widget_factory_init ()) { - g_error ("Unable to initialise application: missing glade file"); + g_error (_("Unable to initialise application: missing glade file")); return FALSE; } @@ -54,7 +54,7 @@ mixgtk_restart (void) if (!mixgtk_cmd_dispatcher_init (MIXGTK_MAIN)) { - g_error ("Unable to initialise application (command dispatcher)\n"); + g_error (_("Unable to initialise application (command dispatcher)\n")); return FALSE; } @@ -62,13 +62,13 @@ mixgtk_restart (void) if (!mixgtk_mixvm_init (vm, MIXGTK_MIXVM_DIALOG)) { - g_error ("Unable to initialise application (mixvm widgets)\n"); + g_error (_("Unable to initialise application (mixvm widgets)\n")); return FALSE; } if (!mixgtk_mixal_init (vm, MIXGTK_MIXAL_DIALOG)) { - g_error ("Unable to initialise application (mixal widgets)\n"); + g_error (_("Unable to initialise application (mixal widgets)\n")); return FALSE; } @@ -77,13 +77,13 @@ mixgtk_restart (void) (MIXGTK_DEVICES_DIALOG, MIXGTK_WIDGET_DEVICE)), vm)) { - g_error ("Unable to initialise application (devices)\n"); + g_error (_("Unable to initialise application (devices)\n")); return FALSE; } if (!mixgtk_wm_init ()) { - g_error ("Unable to initialise application (visibility)\n"); + g_error (_("Unable to initialise application (visibility)\n")); return FALSE; } diff --git a/mixgtk/mixgtk_device.c b/mixgtk/mixgtk_device.c index b3cf0c8..3c55021 100644 --- a/mixgtk/mixgtk_device.c +++ b/mixgtk/mixgtk_device.c @@ -1,7 +1,7 @@ /* -*-c-*- ---------------- mixgtk_device.c : * actual types for mixgtk devices * ------------------------------------------------------------------ - * $Id: mixgtk_device.c,v 1.18 2002/04/09 23:28:19 jao Exp $ + * $Id: mixgtk_device.c,v 1.19 2002/04/10 23:39:40 jao Exp $ * ------------------------------------------------------------------ * Copyright (C) 2001, 2002 Free Software Foundation, Inc. * @@ -551,7 +551,7 @@ devdir_callback (const gchar *file) void on_devdir_browse_clicked () { - mixgtk_get_file (devdir_callback, "Devices dir", mix_device_get_dir ()); + mixgtk_get_file (devdir_callback, _("Devices dir"), mix_device_get_dir ()); } void diff --git a/mixgtk/mixgtk_gen_handlers.c b/mixgtk/mixgtk_gen_handlers.c index 0d3daa3..656286b 100644 --- a/mixgtk/mixgtk_gen_handlers.c +++ b/mixgtk/mixgtk_gen_handlers.c @@ -1,9 +1,9 @@ /* -*-c-*- -------------- mixgtk_gen_handlers.c : * Implementation of the functions declared in mixgtk_gen_handlers.h * ------------------------------------------------------------------ - * Last change: Time-stamp: "2001-04-29 12:32:47 jao" + * $Id: mixgtk_gen_handlers.c,v 1.8 2002/04/10 23:39:40 jao Exp $ * ------------------------------------------------------------------ - * Copyright (C) 2001 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -100,7 +100,7 @@ static void open_cb_ (const gchar *file) void on_file_open_activate (GtkWidget *w, gpointer data) { - mixgtk_get_file (open_cb_, "Load MIX program...", "*.mix"); + mixgtk_get_file (open_cb_, _("Load MIX program..."), "*.mix"); } /* edit mixal source */ @@ -112,7 +112,7 @@ static void edit_cb_ (const gchar *file) void on_file_edit_activate (GtkWidget *w, gpointer data) { - mixgtk_get_file (edit_cb_, "Edit MIXAL source file...", + mixgtk_get_file (edit_cb_, _("Edit MIXAL source file..."), mixgtk_cmd_dispatcher_get_src_path ()); } @@ -125,7 +125,7 @@ static void compile_cb_ (const gchar *file) void on_file_compile_activate (GtkWidget *w, gpointer data) { - mixgtk_get_file (compile_cb_, "Compile MIXAL source file...", + mixgtk_get_file (compile_cb_, _("Compile MIXAL source file..."), mixgtk_cmd_dispatcher_get_src_path ()); } diff --git a/mixgtk/mixgtk_mixal.c b/mixgtk/mixgtk_mixal.c index 42a11ce..dc0f6d5 100644 --- a/mixgtk/mixgtk_mixal.c +++ b/mixgtk/mixgtk_mixal.c @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk_mixal.c : * Implementation of the functions declared in mixgtk_mixal.h * ------------------------------------------------------------------ - * $Id: mixgtk_mixal.c,v 1.15 2002/04/09 23:55:20 jao Exp $ + * $Id: mixgtk_mixal.c,v 1.16 2002/04/10 23:39:40 jao Exp $ * ------------------------------------------------------------------ * Copyright (C) 2001, 2002 Free Software Foundation, Inc. * @@ -103,7 +103,7 @@ parse_color_ (const gchar *str) static GdkColor color; if (sscanf (str, "%hd%hd%hd", &(color.red), &(color.green), &(color.blue)) < 3) { - g_warning ("Wrong color spec: %s\n", str); + g_warning (_("Wrong color spec: %s\n"), str); return NULL; } diff --git a/mixgtk/mixgtk_mixvm.c b/mixgtk/mixgtk_mixvm.c index 637ee31..d7f48c8 100644 --- a/mixgtk/mixgtk_mixvm.c +++ b/mixgtk/mixgtk_mixvm.c @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk_mixvm.c : * Implementation of the functions declared in mixgtk_mixvm.h * ------------------------------------------------------------------ - * $Id: mixgtk_mixvm.c,v 1.9 2002/04/09 23:55:20 jao Exp $ + * $Id: mixgtk_mixvm.c,v 1.10 2002/04/10 23:39:40 jao Exp $ * ------------------------------------------------------------------ * Copyright (C) 2001, 2002 Free Software Foundation, Inc. * @@ -361,18 +361,19 @@ on_register_click (GtkWidget *w, GdkEvent *e, gpointer data) gint k; if (w == GTK_WIDGET (reg_entries_[0])) - mixgtk_input_word ("Register A", mix_vm_get_rA (vm_), + mixgtk_input_word (_("Register A"), mix_vm_get_rA (vm_), register_AX_, GINT_TO_POINTER (0)); else if (w == GTK_WIDGET (reg_entries_[1])) - mixgtk_input_word ("Register X", mix_vm_get_rX (vm_), + mixgtk_input_word (_("Register X"), mix_vm_get_rX (vm_), register_AX_, GINT_TO_POINTER(1)); else if (w == GTK_WIDGET (reg_entries_[2])) - mixgtk_input_short ("Register J", mix_vm_get_rJ (vm_), register_j_, NULL); + mixgtk_input_short (_("Register J"), mix_vm_get_rJ (vm_), + register_j_, NULL); else for (k = 1; k < 7; ++k) { if (w == GTK_WIDGET (reg_entries_[2 + k])) { - g_snprintf (BUFFER, SIZE, "Register I%d", k); + g_snprintf (BUFFER, SIZE, _("Register I%d"), k); mixgtk_input_short (BUFFER, mix_vm_get_rI (vm_, k), register_i_, GINT_TO_POINTER (k)); break; @@ -395,7 +396,7 @@ on_memory_cells_select_row (GtkCList *w, gint row, gint col, { enum {SIZE = 30}; static gchar BUFFER[SIZE]; - g_snprintf (BUFFER, SIZE, "Memory cell no. %d", row); + g_snprintf (BUFFER, SIZE, _("Memory cell no. %d"), row); mixgtk_input_word (BUFFER, mix_vm_get_addr_contents (vm_, mix_short_new (row)), mem_cell_, GINT_TO_POINTER (row)); diff --git a/mixguile/mixguile.c b/mixguile/mixguile.c index 2f1ae48..ed66ee6 100644 --- a/mixguile/mixguile.c +++ b/mixguile/mixguile.c @@ -1,9 +1,9 @@ /* -*-c-*- -------------- mixguile.c : * Implementation of the functions declared in mixguile.h * ------------------------------------------------------------------ - * $Id: mixguile.c,v 1.6 2001/09/28 23:10:45 jao Exp $ + * $Id: mixguile.c,v 1.7 2002/04/10 23:39:40 jao Exp $ * ------------------------------------------------------------------ - * Copyright (C) 2001 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -71,7 +71,7 @@ mixguile_load_bootstrap (gboolean loadlocal) if (access (scmfile, R_OK) && access ((scmfile = LOCAL_SCM_FILE), R_OK)) { - g_warning ("mixguile bootstrap file %s not found\n", SCM_FILE); + g_warning (_("mixguile bootstrap file %s not found\n"), SCM_FILE); scmfile = NULL; } else diff --git a/mixlib/mix.c b/mixlib/mix.c index af1ba40..7a1f4a9 100644 --- a/mixlib/mix.c +++ b/mixlib/mix.c @@ -1,9 +1,9 @@ /* -*-c-*- -------------- mix.c : * Implementation of the functions declared in mix.h * ------------------------------------------------------------------ - * $Id: mix.c,v 1.4 2001/09/28 23:10:45 jao Exp $ + * $Id: mix.c,v 1.5 2002/04/10 23:39:40 jao Exp $ * ------------------------------------------------------------------ - * Copyright (C) 2000, 2001 Free Software Foundation, Inc. + * Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -81,7 +81,7 @@ mix_stat_dir (const gchar *dirname, const gchar *alias) { if (errno != ENOENT || mkdir (dirname, S_IRWXU | S_IRWXG | S_IRWXO)) { - g_warning ("Error creating %s dir %s: %s", + g_warning (_("Error creating %s dir %s: %s"), alias, dirname, strerror (errno)); return FALSE; } @@ -90,7 +90,7 @@ mix_stat_dir (const gchar *dirname, const gchar *alias) if (!(statbuf.st_mode & S_IFDIR)) { - g_warning ("Error setting %s dir: %s is not a directory", + g_warning (_("Error setting %s dir: %s is not a directory"), alias, dirname); return FALSE; } diff --git a/mixlib/mix_config.c b/mixlib/mix_config.c index 74a669f..d13feab 100644 --- a/mixlib/mix_config.c +++ b/mixlib/mix_config.c @@ -1,9 +1,9 @@ /* -*-c-*- -------------- mix_config.c : * Implementation of the functions declared in mix_config.h * ------------------------------------------------------------------ - * $Id: mix_config.c,v 1.7 2001/09/18 22:49:56 jao Exp $ + * $Id: mix_config.c,v 1.8 2002/04/10 23:39:40 jao Exp $ * ------------------------------------------------------------------ - * Copyright (C) 2001 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -215,7 +215,7 @@ mix_config_save (const mix_config_t *config) f = fopen (config->filename, "w"); if (!f) { - g_warning ("Unable to open config file %s (%s)", + g_warning (_("Unable to open config file %s (%s)"), config->filename, g_strerror (errno)); return; } diff --git a/mixlib/mix_predicate.c b/mixlib/mix_predicate.c index 1ca2bd5..5eb487d 100644 --- a/mixlib/mix_predicate.c +++ b/mixlib/mix_predicate.c @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mix_predicate.c : * Implementation of the functions declared in mix_predicate.h * ------------------------------------------------------------------ - * $Id: mix_predicate.c,v 1.4 2002/04/09 23:28:19 jao Exp $ + * $Id: mix_predicate.c,v 1.5 2002/04/10 23:39:40 jao Exp $ * ------------------------------------------------------------------ * Copyright (C) 2001, 2002 Free Software Foundation, Inc. * @@ -173,36 +173,36 @@ mix_predicate_get_message (const mix_predicate_t *predicate) switch (predicate->type) { case MIX_PRED_REG_A: - g_snprintf (BUFFER, SIZE, "Register A changed to %s%ld", + g_snprintf (BUFFER, SIZE, _("Register A changed to %s%ld"), mix_word_is_negative (predicate->data.regA)? "-" : "+", mix_word_magnitude (predicate->data.regA)); break; case MIX_PRED_REG_X: - g_snprintf (BUFFER, SIZE, "Register X changed to %s%ld", + g_snprintf (BUFFER, SIZE, _("Register X changed to %s%ld"), mix_word_is_negative (predicate->data.regX)? "-" : "+", mix_word_magnitude (predicate->data.regX)); break; case MIX_PRED_REG_J: - g_snprintf (BUFFER, SIZE, "Register J changed to %d", + g_snprintf (BUFFER, SIZE, _("Register J changed to %d"), mix_short_magnitude (predicate->data.regI)); break; case MIX_PRED_REG_I1: case MIX_PRED_REG_I2: case MIX_PRED_REG_I3: case MIX_PRED_REG_I4: case MIX_PRED_REG_I5: case MIX_PRED_REG_I6: - g_snprintf (BUFFER, SIZE, "Register I%d changed to %s%d", + g_snprintf (BUFFER, SIZE, _("Register I%d changed to %s%d"), predicate->control, mix_short_is_negative (predicate->data.regI)? "-" : "+", mix_short_magnitude (predicate->data.regI)); break; case MIX_PRED_CMP: - g_snprintf (BUFFER, SIZE, "Comparison flag changed to %s", + g_snprintf (BUFFER, SIZE, _("Comparison flag changed to %s"), CMP_STRINGS[predicate->data.cmp]); break; case MIX_PRED_OVER: - g_snprintf (BUFFER, SIZE, "Overflow toggled %s", + g_snprintf (BUFFER, SIZE, _("Overflow toggled %s"), predicate->data.over ? "ON" : "OFF"); break; case MIX_PRED_MEM: - g_snprintf (BUFFER, SIZE, "Memory address %d changed to %s%ld", + g_snprintf (BUFFER, SIZE, _("Memory address %d changed to %s%ld"), predicate->control, mix_word_is_negative (predicate->data.mem)? "-" : "+", mix_word_magnitude (predicate->data.mem)); diff --git a/mixlib/mix_vm_command.c b/mixlib/mix_vm_command.c index 81e0bb6..d99bd6d 100644 --- a/mixlib/mix_vm_command.c +++ b/mixlib/mix_vm_command.c @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mix_vm_command.c : * Implementation of the functions declared in mix_vm_command.h * ------------------------------------------------------------------ - * $Id: mix_vm_command.c,v 1.27 2002/04/09 23:28:19 jao Exp $ + * $Id: mix_vm_command.c,v 1.28 2002/04/10 23:39:40 jao Exp $ * ------------------------------------------------------------------ * Copyright (C) 2001, 2002 Free Software Foundation, Inc. * @@ -476,7 +476,7 @@ mix_vm_cmd_dispatcher_dispatch (mix_vm_cmd_dispatcher_t *dis, } else { - fprintf (dis->err, "Unknown command. Try: help\n"); + fprintf (dis->err, _("Unknown command. Try: help\n")); } if (dis->global_post) diff --git a/mixutils/mixvm_command.c b/mixutils/mixvm_command.c index f85550a..bbc1339 100644 --- a/mixutils/mixvm_command.c +++ b/mixutils/mixvm_command.c @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixvm_command.c : * Implementation of the functions declared in mixvm_command.h * ------------------------------------------------------------------ - * $Id: mixvm_command.c,v 1.8 2002/04/08 00:32:32 jao Exp $ + * $Id: mixvm_command.c,v 1.9 2002/04/10 23:39:40 jao Exp $ * ------------------------------------------------------------------ * Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. * @@ -163,7 +163,7 @@ emacs_output_ (mix_vm_cmd_dispatcher_t *dis, const gchar *arg, gpointer data) static int cmd_quit_ (mix_vm_cmd_dispatcher_t *dis, const char *arg) { - puts ("Quitting ..."); + puts (_("Quitting ...")); if (dis_) mix_vm_cmd_dispatcher_delete (dis_); if (config_) mix_config_delete (config_); exit (0); -- cgit v1.2.3