mirror of
https://github.com/MidnightCommander/mc
synced 2024-12-22 20:36:50 +03:00
1999-08-08 David Martin <dmartina@usa.net>
* gtkedit/syntax.c (upgrade_syntax_file): Mark error strings for translation. * gtkedit/editmenu.c (edit_about_cmd): Mark text in "about" for translation as it used to be. * po/POTFILES.in: Removed symbolic links, and outdated gmc-window.[ch] and olddnd.c. These don't repport any new strings, increase compile time and make po files large. Basically adds gaction.c, g,mount, smbfs.c to the pre-previous file. * po/es.po: Added new strings with latest editor changes. Added strings in gaction.c. Merged with a new mc.pot after the changes in POTFILES.in. * gnome/gaction.c (mainly gmc_unable_to_execute_dlg): Moved g_strconcat to g_strdup_printf, to get compact strings and make coherent translations. Translate atomic actions (open, edit, view) when calling this function. * src/menu.c: (create_menu): Adjust "#ifdef ENABLE_NLS" so that menus get the right size even when NLS is disabled. 1999-08-08 Norbert Warmuth <nwarmuth@privat.circular.de> * po/POTFILE.in: Removed gpopup.c as it is not compiled.
This commit is contained in:
Norbert Warmuth
parent
bbae2bc97a
commit
ccdd7f5bce
@ -1,3 +1,11 @@
|
||||
1999-08-08 David Martin <dmartina@usa.net>
|
||||
|
||||
* gtkedit/syntax.c (upgrade_syntax_file): Mark error strings for
|
||||
translation.
|
||||
|
||||
* gtkedit/editmenu.c (edit_about_cmd): Mark text in "about" for
|
||||
translation as it used to be.
|
||||
|
||||
1999-08-05 Federico Mena Quintero <federico@nuclecu.unam.mx>
|
||||
|
||||
* doc-gnome/C/gmc.sgml: Set the book element's id to "index" so
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
1999-08-08 David Martin <dmartina@usa.net>
|
||||
|
||||
* gaction.c (mainly gmc_unable_to_execute_dlg): Moved g_strconcat
|
||||
to g_strdup_printf, to get compact strings and make coherent
|
||||
translations. Translate atomic actions (open, edit, view) when
|
||||
calling this function.
|
||||
|
||||
1999-08-06 Federico Mena Quintero <federico@nuclecu.unam.mx>
|
||||
|
||||
* gdesktop.c (try_rename): New function to rename a desktop icon's
|
||||
|
||||
@ -29,34 +29,28 @@ gmc_unable_to_execute_dlg (gchar *fname, const gchar *command, gchar *action, co
|
||||
gchar *msg;
|
||||
gchar *fix = NULL;
|
||||
if (!strcmp (action, "x-gnome-app-info")) {
|
||||
msg = g_strconcat (_("Unable to execute\n\""),
|
||||
fname,
|
||||
_("\".\n\nPlease check it to see if it points to a valid command."),
|
||||
NULL);
|
||||
msg = g_strdup_printf (
|
||||
_("Unable to execute\n\"%s\".\n\n"
|
||||
"Please check it to see if it points to a valid command."),
|
||||
fname);
|
||||
|
||||
} else {
|
||||
if (mime)
|
||||
fix = g_strconcat (_("\".\n\nTo fix this, bring up the mime-properties editor "
|
||||
"in the GNOME Control Center, and edit the default "),
|
||||
action,
|
||||
_("-action for \""),
|
||||
mime,
|
||||
"\".",
|
||||
NULL);
|
||||
fix = g_strdup_printf (
|
||||
_("\".\n\nTo fix this, bring up the mime-properties editor "
|
||||
"in the GNOME Control Center, and edit the default %s"
|
||||
"-action for \"%s\"."),
|
||||
action, mime);
|
||||
else
|
||||
fix = g_strconcat (_("\".\n\nTo fix this error, bring up this file's properties "
|
||||
"and change the default "),
|
||||
action,
|
||||
_("-action."),
|
||||
NULL);
|
||||
msg = g_strconcat (_("Unable to "),
|
||||
action,
|
||||
"\n\"",
|
||||
fname,
|
||||
_("\"\nwith the command:\n\""),
|
||||
command,
|
||||
fix,
|
||||
NULL);
|
||||
fix = g_strdup_printf (
|
||||
_("\".\n\nTo fix this error, bring up this file's properties "
|
||||
"and change the default %s-action."),
|
||||
action);
|
||||
|
||||
msg = g_strdup_printf (
|
||||
_("Unable to %s\n\"%s\"\nwith the command:\n\"%s\"%s"),
|
||||
action, fname, command, fix);
|
||||
|
||||
g_free (fix);
|
||||
}
|
||||
msg_dialog = gnome_message_box_new (msg,
|
||||
@ -72,7 +66,6 @@ gmc_unable_to_execute_dlg (gchar *fname, const gchar *command, gchar *action, co
|
||||
|
||||
gnome_dialog_run_and_close (GNOME_DIALOG (msg_dialog));
|
||||
g_free (msg);
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
@ -80,6 +73,7 @@ gmc_execute (const char *fname, const char *buf, int needs_terminal)
|
||||
{
|
||||
exec_extension (fname, buf, NULL, NULL, 0, needs_terminal);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gmc_check_exec_string (const char *buf)
|
||||
{
|
||||
@ -137,7 +131,7 @@ gmc_open_filename (char *fname, GList *args)
|
||||
if (gmc_check_exec_string (buf))
|
||||
gmc_execute (fname, buf, needs_terminal);
|
||||
else
|
||||
gmc_unable_to_execute_dlg (fname, buf, "open", NULL);
|
||||
gmc_unable_to_execute_dlg (fname, buf, _("open"), NULL);
|
||||
g_free (buf);
|
||||
return 1;
|
||||
}
|
||||
@ -153,7 +147,7 @@ gmc_open_filename (char *fname, GList *args)
|
||||
if (gmc_check_exec_string (cmd))
|
||||
gmc_execute (fname, cmd, needs_terminal);
|
||||
else
|
||||
gmc_unable_to_execute_dlg (fname, cmd, "open", mime_type);
|
||||
gmc_unable_to_execute_dlg (fname, cmd, _("open"), mime_type);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -188,7 +182,7 @@ gmc_edit (char *fname)
|
||||
if (gmc_check_exec_string (buf))
|
||||
gmc_execute (fname, buf, 0);
|
||||
else
|
||||
gmc_unable_to_execute_dlg (fname, buf, "edit", NULL);
|
||||
gmc_unable_to_execute_dlg (fname, buf, _("edit"), NULL);
|
||||
g_free (buf);
|
||||
return 1;
|
||||
}
|
||||
@ -201,7 +195,7 @@ gmc_edit (char *fname)
|
||||
if (gmc_check_exec_string (cmd))
|
||||
gmc_execute (fname, cmd, 0);
|
||||
else
|
||||
gmc_unable_to_execute_dlg (fname, cmd, "edit", mime_type);
|
||||
gmc_unable_to_execute_dlg (fname, cmd, _("edit"), mime_type);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
@ -334,7 +328,7 @@ gmc_view (char *filename, int start_line)
|
||||
if (gmc_check_exec_string (cmd))
|
||||
gmc_run_view (filename, cmd);
|
||||
else
|
||||
gmc_unable_to_execute_dlg (filename, cmd, "view", mime_type);
|
||||
gmc_unable_to_execute_dlg (filename, cmd, _("view"), mime_type);
|
||||
g_free (cmd);
|
||||
return 1;
|
||||
} else
|
||||
|
||||
@ -71,14 +71,14 @@ void edit_wrap_cmd ()
|
||||
|
||||
void edit_about_cmd ()
|
||||
{
|
||||
edit_message_dialog (wedit->mainid, 20, 20, " About ",
|
||||
"\n"
|
||||
edit_message_dialog (wedit->mainid, 20, 20, _(" About "),
|
||||
_("\n"
|
||||
" Cooledit v3.11.5\n"
|
||||
"\n"
|
||||
" Copyright (C) 1996 the Free Software Foundation\n"
|
||||
"\n"
|
||||
" A user friendly text editor written\n"
|
||||
" for the Midnight Commander.\n"
|
||||
" for the Midnight Commander.\n")
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@ -1348,9 +1348,9 @@ FILE *upgrade_syntax_file (char *syntax_file)
|
||||
rename (syntax_file, s);
|
||||
unlink (syntax_file); /* might rename() fail ? */
|
||||
#if defined(MIDNIGHT) || defined(GTK)
|
||||
edit_message_dialog (" Load Syntax Rules ", " Your syntax rule file is outdated \n A new rule file is being installed. \n Your old rule file has been saved with a .OLD extension. ");
|
||||
edit_message_dialog (_(" Load Syntax Rules "), _(" Your syntax rule file is outdated \n A new rule file is being installed. \n Your old rule file has been saved with a .OLD extension. "));
|
||||
#else
|
||||
CMessageDialog (0, 20, 20, 0, " Load Syntax Rules ", " Your syntax rule file is outdated \n A new rule file is being installed. \n Your old rule file has been saved with a .OLD extension. ");
|
||||
CMessageDialog (0, 20, 20, 0,_(" Load Syntax Rules "), _(" Your syntax rule file is outdated \n A new rule file is being installed. \n Your old rule file has been saved with a .OLD extension. "));
|
||||
#endif
|
||||
return upgrade_syntax_file (syntax_file);
|
||||
}
|
||||
|
||||
15
po/ChangeLog
15
po/ChangeLog
@ -1,3 +1,18 @@
|
||||
1999-08-08 Norbert Warmuth <nwarmuth@privat.circular.de>
|
||||
|
||||
* POTFILE.in: Removed gpopup.c as it is not compiled.
|
||||
|
||||
1999-08-08 David Martin <dmartina@usa.net>
|
||||
|
||||
* POTFILES.in: Removed symbolic links, and outdated
|
||||
gmc-window.[ch] and olddnd.c. These don't repport any new strings,
|
||||
increase compile time and make po files large. Basically adds
|
||||
gaction.c, g,mount, smbfs.c to the pre-previous file.
|
||||
|
||||
* es.po: Added new strings with latest editor changes. Added
|
||||
strings in gaction.c. Merged with a new mc.pot after the changes
|
||||
in POTFILES.in.
|
||||
|
||||
1999-08-01 David Martin <dmartina@usa.net>
|
||||
|
||||
* es.po, es_ES.po: added translation for history box title
|
||||
|
||||
@ -1,26 +1,4 @@
|
||||
edit/edit.c
|
||||
edit/edit.h
|
||||
edit/edit_key_translator.c
|
||||
edit/editcmd.c
|
||||
edit/editmenu.c
|
||||
edit/editoptions.c
|
||||
edit/editwidget.c
|
||||
edit/gtkedit.c
|
||||
edit/syntax.c
|
||||
gnome/achown.c
|
||||
gnome/background.c
|
||||
gnome/boxes.c
|
||||
gnome/chmod.c
|
||||
gnome/chown.c
|
||||
gnome/cmd.c
|
||||
gnome/command.c
|
||||
gnome/dialog.c
|
||||
gnome/dir.c
|
||||
gnome/ext.c
|
||||
gnome/file.c
|
||||
gnome/filegui.c
|
||||
gnome/find.c
|
||||
gnome/fixhlp.c
|
||||
gnome/gaction.c
|
||||
gnome/gcmd.c
|
||||
gnome/gcustom-layout.c
|
||||
@ -30,11 +8,9 @@ gnome/gdnd.c
|
||||
gnome/gicon.c
|
||||
gnome/glayout.c
|
||||
gnome/gmain.c
|
||||
gnome/gmc-window.c
|
||||
gnome/gmount.c
|
||||
gnome/gnome-file-property-dialog.c
|
||||
gnome/gnome-open-dialog.c
|
||||
gnome/gpopup.c
|
||||
gnome/gpopup2.c
|
||||
gnome/gprefs.c
|
||||
gnome/gprop.c
|
||||
@ -42,30 +18,6 @@ gnome/gscreen.c
|
||||
gnome/gtools.c
|
||||
gnome/gview.c
|
||||
gnome/gwidget.c
|
||||
gnome/help.c
|
||||
gnome/hotlist.c
|
||||
gnome/i18n.h
|
||||
gnome/info.c
|
||||
gnome/layout.c
|
||||
gnome/learn.c
|
||||
gnome/main.c
|
||||
gnome/menu.c
|
||||
gnome/olddnd.c
|
||||
gnome/option.c
|
||||
gnome/panelize.c
|
||||
gnome/popthelp.c
|
||||
gnome/poptint.h
|
||||
gnome/screen.c
|
||||
gnome/subshell.c
|
||||
gnome/tree.c
|
||||
gnome/treestore.c
|
||||
gnome/user.c
|
||||
gnome/util.c
|
||||
gnome/utilunix.c
|
||||
gnome/view.c
|
||||
gnome/widget.c
|
||||
gnome/win.c
|
||||
gnome/wtools.c
|
||||
gtkedit/edit.c
|
||||
gtkedit/edit.h
|
||||
gtkedit/editcmd.c
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
1999-08-08 David Martin <dmartina@usa.net>
|
||||
|
||||
* menu.c: (create_menu): Adjust "#ifdef ENABLE_NLS" so that menus
|
||||
get the right size even when NLS is disabled.
|
||||
|
||||
1999-08-06 Norbert Warmuth <nwarmuth@privat.circular.de>
|
||||
|
||||
* screen.c (string_file_[amc]time): These three functions use
|
||||
|
||||
@ -57,12 +57,13 @@ Menu create_menu (char *name, menu_entry *entries, int count)
|
||||
menu->max_entry_len = 20;
|
||||
menu->entries = entries;
|
||||
|
||||
#ifdef ENABLE_NLS
|
||||
if (entries != (menu_entry*) NULL) {
|
||||
register menu_entry* mp;
|
||||
for (mp = entries; count--; mp++) {
|
||||
if (mp->text[0] != '\0') {
|
||||
#ifdef ENABLE_NLS
|
||||
mp->text = _(mp->text);
|
||||
#endif /* ENABLE_NLS */
|
||||
cp = strchr (mp->text,'&');
|
||||
|
||||
if (cp != NULL && *(cp+1) != '\0') {
|
||||
@ -76,7 +77,6 @@ Menu create_menu (char *name, menu_entry *entries, int count)
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif /* ENABLE_NLS */
|
||||
|
||||
menu->name = g_strdup ( _(name) );
|
||||
menu_scan_hotkey(menu);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user