Uppercase in Hotkeys & menus
David Martin
dmartina at excite.es
Tue Aug 14 18:22:39 UTC 2001
This is the patch. If fixes Hotkeys and aligns the Command menu for the
original C locale. The patch to reset al .po files is included
*8-) David
---------------------------
diff -1 -upr mc-4.5.54a-proski/src/ChangeLog mc-4.5.54a/src/ChangeLog
--- mc-4.5.54a-proski/src/ChangeLog Tue Aug 14 06:48:01 2001
+++ mc-4.5.54a/src/ChangeLog Tue Aug 14 18:12:01 2001
@@ -1 +1,16 @@
+2001-08-13 David Martin <dmartina at excite.es>
+
+ * achown.c: Use uppercase in messages (only) for hotkeys.
+ * boxes.c: Likewise
+ * chmod.c: Likewise
+ * chown.c: Likewise
+ * file.c: Likewise
+ * find.c: Likewise
+ * hotlist.c: Likewise
+ * panelize.c: Likewise
+
+ * main.c: Right align menu shortcuts and some code tidying.
+ Use ... in menu entries when dialog is opened.
+ Use uppercase in messages (only) for hotkeys.
+
2001-08-14 Pavel Roskin <proski at gnu.org>
diff -1 -upr mc-4.5.54a-proski/src/achown.c mc-4.5.54a/src/achown.c
--- mc-4.5.54a-proski/src/achown.c Sun Aug 12 06:25:48 2001
+++ mc-4.5.54a/src/achown.c Tue Aug 14 18:12:01 2001
@@ -72,11 +72,11 @@ static struct {
} chown_advanced_but [BUTTONS] = {
- { B_CANCEL, NORMAL_BUTTON, 4, 53, N_("&Cancel") },
- { B_ENTER, DEFPUSH_BUTTON,4, 40, N_("&Set") },
- { B_SKIP, NORMAL_BUTTON, 4, 23, N_("S&kip") },
- { B_SETALL, NORMAL_BUTTON, 4, 0, N_("Set &all")},
- { B_ENTER, NARROW_BUTTON, 0, 47, " "},
- { B_ENTER, NARROW_BUTTON, 0, 29, " "},
- { B_ENTER, NARROW_BUTTON, 0, 19, " "},
- { B_ENTER, NARROW_BUTTON, 0, 11, " "},
- { B_ENTER, NARROW_BUTTON, 0, 3, " "},
+ { B_CANCEL, NORMAL_BUTTON, 4, 53, N_("&Cancel") },
+ { B_ENTER, DEFPUSH_BUTTON, 4, 40, N_("&Set") },
+ { B_SKIP, NORMAL_BUTTON, 4, 23, N_("s&Kip") },
+ { B_SETALL, NORMAL_BUTTON, 4, 0, N_("set &All") },
+ { B_ENTER, NARROW_BUTTON, 0, 47, " " },
+ { B_ENTER, NARROW_BUTTON, 0, 29, " " },
+ { B_ENTER, NARROW_BUTTON, 0, 19, " " },
+ { B_ENTER, NARROW_BUTTON, 0, 11, " " },
+ { B_ENTER, NARROW_BUTTON, 0, 3, " " },
};
diff -1 -upr mc-4.5.54a-proski/src/boxes.c mc-4.5.54a/src/boxes.c
--- mc-4.5.54a-proski/src/boxes.c Tue Aug 7 02:09:46 2001
+++ mc-4.5.54a/src/boxes.c Tue Aug 14 18:13:54 2001
@@ -281,3 +281,3 @@ sort_box (sortfn *sort_fn, int *reverse,
char* reverse_label = _("&Reverse");
- char* case_label = _("case sensi&tive");
+ char* case_label = _("case sensi&Tive");
char* sort_title = _("Sort order");
@@ -464,3 +464,3 @@ static int new_meta;
char *display_bits_str [] =
-{ N_("Full 8 bits output"), N_("ISO 8859-1"), N_("7 bits") };
+{ N_("full &8 bits output"), N_("&ISO 8859-1"), N_("&7 bits") };
@@ -471,3 +471,3 @@ static QuickWidget display_widgets [] =
0, B_ENTER, 0, 0, "o" },
-{ quick_checkbox, 4, DISPX, 7, DISPY, N_("F&ull 8 bits input"),
+{ quick_checkbox, 4, DISPX, 7, DISPY, N_("f&Ull 8 bits input"),
0, 0, &new_meta, 0, "u" },
@@ -619,3 +619,3 @@ void init_disp_bits_box()
inpcheck = check_new( 6, 4, !use_8th_bit_as_meta,
- _("F&ull 8 bits input"), NULL );
+ _("f&Ull 8 bits input"), NULL );
add_widget( dbits_dlg, inpcheck );
diff -1 -upr mc-4.5.54a-proski/src/chmod.c mc-4.5.54a/src/chmod.c
--- mc-4.5.54a-proski/src/chmod.c Sun Aug 12 06:25:48 2001
+++ mc-4.5.54a/src/chmod.c Tue Aug 14 18:12:01 2001
@@ -110,6 +110,6 @@ static struct {
{ B_ENTER, DEFPUSH_BUTTON, 2, 17, N_("&Set") },
- { B_CLRMRK, NORMAL_BUTTON, 0, 42, N_("C&lear marked") },
- { B_SETMRK, NORMAL_BUTTON, 0, 27, N_("S&et marked") },
+ { B_CLRMRK, NORMAL_BUTTON, 0, 42, N_("c&Lear marked") },
+ { B_SETMRK, NORMAL_BUTTON, 0, 27, N_("s&Et marked") },
{ B_MARKED, NORMAL_BUTTON, 0, 12, N_("&Marked all") },
- { B_ALL, NORMAL_BUTTON, 0, 0, N_("Set &all") },
+ { B_ALL, NORMAL_BUTTON, 0, 0, N_("set &All") },
};
diff -1 -upr mc-4.5.54a-proski/src/chown.c mc-4.5.54a/src/chown.c
--- mc-4.5.54a-proski/src/chown.c Sun Aug 12 06:25:48 2001
+++ mc-4.5.54a/src/chown.c Tue Aug 14 18:12:01 2001
@@ -81,5 +81,5 @@ static struct {
{ B_ENTER, DEFPUSH_BUTTON, 0, 40, N_("&Set") },
- { B_SETUSR, NORMAL_BUTTON, 0, 25, N_("Set &users") },
- { B_SETGRP, NORMAL_BUTTON, 0, 11, N_("Set &groups") },
- { B_SETALL, NORMAL_BUTTON, 0, 0, N_("Set &all") },
+ { B_SETUSR, NORMAL_BUTTON, 0, 25, N_("set &Users") },
+ { B_SETGRP, NORMAL_BUTTON, 0, 11, N_("set &Groups") },
+ { B_SETALL, NORMAL_BUTTON, 0, 0, N_("set &All") },
};
diff -1 -upr mc-4.5.54a-proski/src/file.c mc-4.5.54a/src/file.c
--- mc-4.5.54a-proski/src/file.c Tue Aug 14 02:55:38 2001
+++ mc-4.5.54a/src/file.c Tue Aug 14 18:12:01 2001
@@ -2252,3 +2252,3 @@ real_query_recursive (FileOpContext *ctx
_("&Yes"), _("&No"),
- _("a&ll"), _("non&E"),
+ _("al&L"), _("non&E"),
_("&Abort"));
diff -1 -upr mc-4.5.54a-proski/src/find.c mc-4.5.54a/src/find.c
--- mc-4.5.54a-proski/src/find.c Wed Aug 1 02:58:06 2001
+++ mc-4.5.54a/src/find.c Tue Aug 14 18:12:01 2001
@@ -105,3 +105,3 @@ static struct {
{ N_("&Suspend"), 11, 29 },
- { N_("Con&tinue"), 12, 29 },
+ { N_("con&Tinue"), 12, 29 },
{ N_("&Chdir"), 11, 3 },
@@ -109,3 +109,3 @@ static struct {
{ N_("&Quit"), 8, 43 },
- { N_("Pane&lize"), 12, 3 },
+ { N_("pane&Lize"), 12, 3 },
{ N_("&View - F3"), 13, 20 },
diff -1 -upr mc-4.5.54a-proski/src/hotlist.c mc-4.5.54a/src/hotlist.c
--- mc-4.5.54a-proski/src/hotlist.c Mon Jul 9 09:02:02 2001
+++ mc-4.5.54a/src/hotlist.c Tue Aug 14 18:12:01 2001
@@ -131,4 +131,4 @@ static struct _hotlist_but {
{ B_INSERT, NORMAL_BUTTON, 1, 0, N_("&Insert"), "g",
LIST_MOVELIST},
- { B_NEW_ENTRY, NORMAL_BUTTON, 1, 15, N_("New &Entry"), "e",
LIST_HOTLIST},
- { B_NEW_GROUP, NORMAL_BUTTON, 1, 0, N_("New &Group"), "g",
LIST_HOTLIST},
+ { B_NEW_ENTRY, NORMAL_BUTTON, 1, 15, N_("new &Entry"), "e",
LIST_HOTLIST},
+ { B_NEW_GROUP, NORMAL_BUTTON, 1, 0, N_("new &Group"), "g",
LIST_HOTLIST},
{ B_CANCEL, NORMAL_BUTTON, 0, 53, N_("&Cancel"), "cc",
LIST_HOTLIST|LIST_VFSLIST|LIST_MOVELIST},
@@ -136,3 +136,3 @@ static struct _hotlist_but {
{ B_ADD_CURRENT, NORMAL_BUTTON, 0, 20, N_("&Add current"),"ad",
LIST_HOTLIST},
- { B_ENTER, DEFPUSH_BUTTON, 0, 0, N_("Change &To"), "ct",
LIST_HOTLIST|LIST_VFSLIST|LIST_MOVELIST},
+ { B_ENTER, DEFPUSH_BUTTON, 0, 0, N_("change &To"), "ct",
LIST_HOTLIST|LIST_VFSLIST|LIST_MOVELIST},
};
diff -1 -upr mc-4.5.54a-proski/src/main.c mc-4.5.54a/src/main.c
--- mc-4.5.54a-proski/src/main.c Wed Aug 8 04:19:14 2001
+++ mc-4.5.54a/src/main.c Tue Aug 14 18:12:01 2001
@@ -1256,16 +1256,16 @@ listmode_cmd (void)
static menu_entry PanelMenu [] = {
- { ' ', N_("&Listing mode..."), 'L', listing_cmd },
- { ' ', N_("&Quick view C-x q"), 'Q', quick_view_cmd },
- { ' ', N_("&Info C-x i"), 'I', info_cmd },
- { ' ', N_("&Tree"), 'T', tree_cmd },
+ { ' ', N_("&Listing mode..." ), 'L', listing_cmd },
+ { ' ', N_("&Quick view C-x q"), 'Q', quick_view_cmd },
+ { ' ', N_("&Info C-x i"), 'I', info_cmd },
+ { ' ', N_("&Tree" ), 'T', tree_cmd },
{ ' ', "", ' ', 0 },
- { ' ', N_("&Sort order..."), 'S', sort_cmd },
+ { ' ', N_("&Sort order..." ), 'S', sort_cmd },
{ ' ', "", ' ', 0 },
- { ' ', N_("&Filter..."), 'F', filter_cmd },
+ { ' ', N_("&Filter..." ), 'F', filter_cmd },
#ifdef USE_NETCODE
{ ' ', "", ' ', 0 },
- { ' ', N_("&Network link..."), 'N', netlink_cmd },
- { ' ', N_("FT&P link..."), 'P', ftplink_cmd },
+ { ' ', N_("&Network link..." ), 'N', netlink_cmd },
+ { ' ', N_("FT&P link..." ), 'P', ftplink_cmd },
#ifdef WITH_SMBFS
- { ' ', N_("SM&B link..."), 'B', smblink_cmd },
+ { ' ', N_("SM&B link..." ), 'B', smblink_cmd },
#endif
@@ -1274,5 +1274,5 @@ static menu_entry PanelMenu [] = {
#ifdef OS2_NT
- { ' ', N_("&Drive... M-d"), 'D', drive_cmd_a },
+ { ' ', N_("&Drive... M-d"), 'D', drive_cmd_a },
#endif
- { ' ', N_("&Rescan C-r"), 'R', reread_cmd }
+ { ' ', N_("&Rescan C-r"), 'R', reread_cmd }
};
@@ -1280,16 +1280,16 @@ static menu_entry PanelMenu [] = {
static menu_entry RightMenu [] = {
- { ' ', N_("&Listing mode..."), 'L', listing_cmd },
- { ' ', N_("&Quick view C-x q"), 'Q', quick_view_cmd },
- { ' ', N_("&Info C-x i"), 'I', info_cmd },
- { ' ', N_("&Tree"), 'T', tree_cmd },
+ { ' ', N_("&Listing mode..." ), 'L', listing_cmd },
+ { ' ', N_("&Quick view C-x q"), 'Q', quick_view_cmd },
+ { ' ', N_("&Info C-x i"), 'I', info_cmd },
+ { ' ', N_("&Tree" ), 'T', tree_cmd },
{ ' ', "", ' ', 0 },
- { ' ', N_("&Sort order..."), 'S', sort_cmd },
+ { ' ', N_("&Sort order..." ), 'S', sort_cmd },
{ ' ', "", ' ', 0 },
- { ' ', N_("&Filter..."), 'F', filter_cmd },
+ { ' ', N_("&Filter..." ), 'F', filter_cmd },
#ifdef USE_NETCODE
{ ' ', "", ' ', 0 },
- { ' ', N_("&Network link..."), 'N', netlink_cmd },
- { ' ', N_("FT&P link..."), 'P', ftplink_cmd },
+ { ' ', N_("&Network link..." ), 'N', netlink_cmd },
+ { ' ', N_("FT&P link..." ), 'P', ftplink_cmd },
#ifdef WITH_SMBFS
- { ' ', N_("SM&B link..."), 'B', smblink_cmd },
+ { ' ', N_("SM&B link..." ), 'B', smblink_cmd },
#endif
@@ -1298,5 +1298,5 @@ static menu_entry RightMenu [] = {
#ifdef OS2_NT
- { ' ', N_("&Drive... M-d"), 'D', drive_cmd_b },
+ { ' ', N_("&Drive... M-d"), 'D', drive_cmd_b },
#endif
- { ' ', N_("&Rescan C-r"), 'R', reread_cmd }
+ { ' ', N_("&Rescan C-r"), 'R', reread_cmd }
};
@@ -1306,21 +1306,21 @@ static menu_entry FileMenu [] = {
{ ' ', N_("&View F3"), 'V', view_cmd },
- { ' ', N_("Vie&w file... "), 'W', view_file_cmd },
- { ' ', N_("&Filtered view M-!"), 'F', filtered_view_cmd },
+ { ' ', N_("vie&W file..." ), 'W', view_file_cmd },
+ { ' ', N_("&Filtered view... M-!"), 'F', filtered_view_cmd },
{ ' ', N_("&Edit F4"), 'E', edit_cmd },
- { ' ', N_("&Copy F5"), 'C', copy_cmd },
- { ' ', N_("c&Hmod C-x c"), 'H', chmod_cmd },
+ { ' ', N_("&Copy... F5"), 'C', copy_cmd },
+ { ' ', N_("c&Hmod... C-x c"), 'H', chmod_cmd },
#ifndef OS2_NT
- { ' ', N_("&Link C-x l"), 'L', link_cmd },
- { ' ', N_("&SymLink C-x s"), 'S', symlink_cmd },
+ { ' ', N_("&Link... C-x l"), 'L', link_cmd },
+ { ' ', N_("&SymLink... C-x s"), 'S', symlink_cmd },
{ ' ', N_("edit s&Ymlink C-x C-s"), 'Y', edit_symlink_cmd },
- { ' ', N_("ch&Own C-x o"), 'O', chown_cmd },
- { ' ', N_("&Advanced chown "), 'A', chown_advanced_cmd },
+ { ' ', N_("ch&Own... C-x o"), 'O', chown_cmd },
+ { ' ', N_("&Advanced chown..." ), 'A', chown_advanced_cmd },
#endif
- { ' ', N_("&Rename/Move F6"), 'R', ren_cmd },
- { ' ', N_("&Mkdir F7"), 'M', mkdir_cmd },
+ { ' ', N_("&Rename/Move... F6"), 'R', ren_cmd },
+ { ' ', N_("&Mkdir... F7"), 'M', mkdir_cmd },
{ ' ', N_("&Delete F8"), 'D', delete_cmd },
- { ' ', N_("&Quick cd M-c"), 'Q', quick_cd_cmd },
+ { ' ', N_("&Quick cd... M-c"), 'Q', quick_cd_cmd },
{ ' ', "", ' ', 0 },
- { ' ', N_("select &Group M-+"), 'G', select_cmd },
- { ' ', N_("u&Nselect group M-\\"),'N', unselect_cmd },
+ { ' ', N_("select &Group... M-+"), 'G', select_cmd },
+ { ' ', N_("u&Nselect group... M-\\"),'N', unselect_cmd },
{ ' ', N_("reverse selec&Tion M-*"), 'T', reverse_selection_cmd },
@@ -1336,18 +1336,18 @@ static menu_entry CmdMenu [] = {
*/
- { ' ', N_("&Directory tree"), 'D', tree_box },
- { ' ', N_("&Find file M-?"), 'F', find_cmd },
- { ' ', N_("s&Wap panels C-u"), 'W', swap_cmd },
- { ' ', N_("switch &Panels on/off C-o"), 'P', view_other_cmd },
- { ' ', N_("&Compare directories C-x d"), 'C', compare_dirs_cmd },
- { ' ', N_("e&Xternal panelize C-x !"), 'X', external_panelize },
- { ' ', N_("show directory s&Izes"), 'I', dirsizes_cmd },
+ { ' ', N_("&Directory tree" ), 'D', tree_box },
+ { ' ', N_("&Find file... M-?"), 'F', find_cmd },
+ { ' ', N_("s&Wap panels C-u"), 'W', swap_cmd },
+ { ' ', N_("switch &Panels on/off C-o"), 'P', view_other_cmd },
+ { ' ', N_("&Compare directories... C-x d"), 'C', compare_dirs_cmd },
+ { ' ', N_("e&Xternal panelize... C-x !"), 'X', external_panelize },
+ { ' ', N_("show directory s&Izes" ), 'I', dirsizes_cmd },
{ ' ', "", ' ', 0 },
- { ' ', N_("command &History"), 'H', history_cmd },
- { ' ', N_("di&Rectory hotlist C-\\"), 'R', quick_chdir_cmd },
+ { ' ', N_("command &History" ), 'H', history_cmd },
+ { ' ', N_("di&Rectory hotlist... C-\\"), 'R', quick_chdir_cmd },
#ifdef USE_VFS
- { ' ', N_("&Active VFS list C-x a"), 'A', reselect_vfs },
- { ' ', N_("Fr&ee VFSs now"), 'E', free_vfs_now },
+ { ' ', N_("&Active VFS list... C-x a"), 'A', reselect_vfs },
+ { ' ', N_("fr&Ee VFSs now" ), 'E', free_vfs_now },
#endif
#ifdef WITH_BACKGROUND
- { ' ', N_("&Background jobs C-x j"), 'B', jobs_cmd },
+ { ' ', N_("&Background jobs... C-x j"), 'B', jobs_cmd },
#endif
@@ -1358,3 +1358,3 @@ static menu_entry CmdMenu [] = {
#ifdef LISTMODE_EDITOR
- { ' ', N_("&Listing format edit"), 'L', listmode_cmd},
+ { ' ', N_("&Listing format edit..." ), 'L', listmode_cmd},
#endif
@@ -1363,6 +1363,6 @@ static menu_entry CmdMenu [] = {
#endif
- { ' ', N_("&Extension file edit"), 'E', ext_cmd },
- { ' ', N_("&Menu file edit"), 'M', menu_edit_cmd },
+ { ' ', N_("&Extension file edit..." ), 'E', ext_cmd },
+ { ' ', N_("&Menu file edit..." ), 'M', menu_edit_cmd },
#ifdef USE_INTERNAL_EDIT
- {' ', N_("Menu edi&Tor edit"), 'T', edit_user_menu_cmd}
+ {' ', N_("menu edi&Tor edit..." ), 'T', edit_user_menu_cmd}
#endif /* USE_INTERNAL_EDIT */
@@ -1372,14 +1372,14 @@ static menu_entry CmdMenu [] = {
static menu_entry OptMenu [] = {
- { ' ', N_("&Configuration..."), 'C', configure_box },
- { ' ', N_("&Layout..."), 'L', layout_cmd },
- { ' ', N_("c&Onfirmation..."), 'O', confirm_box },
- { ' ', N_("&Display bits..."), 'D', display_bits_box },
+ { ' ', N_("&Configuration..."), 'C', configure_box },
+ { ' ', N_("&Layout..." ), 'L', layout_cmd },
+ { ' ', N_("c&Onfirmation..." ), 'O', confirm_box },
+ { ' ', N_("&Display bits..." ), 'D', display_bits_box },
#ifndef OS2_NT
- { ' ', N_("learn &Keys..."), 'K', learn_keys },
+ { ' ', N_("learn &Keys..." ), 'K', learn_keys },
#endif /* !OS2_NT */
#ifdef USE_VFS
- { ' ', N_("&Virtual FS..."), 'V', configure_vfs },
+ { ' ', N_("&Virtual FS..." ), 'V', configure_vfs },
#endif /* !USE_VFS */
{ ' ', "", ' ', 0 },
- { ' ', N_("&Save setup"), 'S', save_setup_cmd }
+ { ' ', N_("&Save setup" ), 'S', save_setup_cmd }
};
diff -1 -upr mc-4.5.54a-proski/src/panelize.c mc-4.5.54a/src/panelize.c
--- mc-4.5.54a-proski/src/panelize.c Sun Jul 15 04:41:38 2001
+++ mc-4.5.54a/src/panelize.c Tue Aug 14 18:12:01 2001
@@ -85,3 +85,3 @@ static struct {
{ B_REMOVE, NORMAL_BUTTON, 0, 16, N_("&Remove"), "r"},
- { B_ENTER, DEFPUSH_BUTTON, 0, 0, N_("Pane&lize"),"l"},
+ { B_ENTER, DEFPUSH_BUTTON, 0, 0, N_("pane&Lize"),"l"},
};
_______________________________________________________
¡Tienes cuentas de e-mail GRATIS en Excite España!
A tu disposición en http://correo.excite.es
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: hotkeys13.diff.bz2
URL: <http://lists.midnight-commander.org/pipermail/mc-devel/attachments/20010814/a0975eb0/attachment.ksh>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: fixall17.diff.bz2
URL: <http://lists.midnight-commander.org/pipermail/mc-devel/attachments/20010814/a0975eb0/attachment-0001.ksh>
More information about the mc-devel
mailing list