diff -ruN old/mc-4.5.49/VERSION new/mc-4.5.50/VERSION --- old/mc-4.5.49/VERSION Wed May 24 14:30:28 2000 +++ new/mc-4.5.50/VERSION Mon May 29 17:56:06 2000 @@ -1 +1 @@ -#define VERSION "4.5.49" +#define VERSION "4.5.50" diff -ruN old/mc-4.5.49/configure new/mc-4.5.50/configure --- old/mc-4.5.49/configure Wed May 24 14:30:28 2000 +++ new/mc-4.5.50/configure Mon May 29 17:56:05 2000 @@ -588,7 +588,7 @@ PACKAGE=mc -VERSION=4.5.49 +VERSION=4.5.50 cat >> confdefs.h < /dev/null chmod 700 ~/.mc/tmp MC=~/.mc/tmp/mc-$$ - /usr/local/bin/mc -P "$@" > "$MC" + /gnome/bin/mc -P "$@" > "$MC" cd "`cat $MC`" rm "$MC" unset MC; diff -ruN old/mc-4.5.49/mc.spec new/mc-4.5.50/mc.spec --- old/mc-4.5.49/mc.spec Wed May 24 14:30:28 2000 +++ new/mc-4.5.50/mc.spec Mon May 29 17:56:06 2000 @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 4.5.49 +%define ver 4.5.50 %define RELEASE 1 %define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE} %define prefix /usr Binary files old/mc-4.5.49/po/ca.gmo and new/mc-4.5.50/po/ca.gmo differ diff -ruN old/mc-4.5.49/po/cat-id-tbl.c new/mc-4.5.50/po/cat-id-tbl.c --- old/mc-4.5.49/po/cat-id-tbl.c Wed May 24 14:30:50 2000 +++ new/mc-4.5.50/po/cat-id-tbl.c Mon May 29 17:56:44 2000 @@ -955,347 +955,353 @@ {" Can't execute commands on a Virtual File System directory ", 833}, {" file error", 834}, {"Format of the ", 835}, - {" file error ", 836}, - {"Format of the ~/", 837}, + {"\ +mc.ext file has changed\n\ +with version 3.0. It seems that installation\n\ +failed. Please fetch a fresh new copy from the\n\ +Midnight Commander package or in case you don't\n\ +have any, get it from ftp://ftp.nuclecu.unam.mx.", 836}, + {" file error ", 837}, + {"Format of the ~/", 838}, {"\ file has changed\n\ with version 3.0. You may want either to\n\ -copy it from ", 838}, +copy it from ", 839}, {"\ mc.ext or use that\n\ -file as an example of how to write it.\n", 839}, - {"mc.ext will be used for this moment.", 840}, - {"Edition: ", 841}, - {"XView", 842}, - {"Tk", 843}, - {"text mode", 844}, - {" with X11 support to read modifiers", 845}, - {"Virtual File System: tarfs, extfs", 846}, - {", ftpfs", 847}, - {" (proxies: hsc proxy)", 848}, - {", mcfs", 849}, - {" (with termnet support)", 850}, - {", smbfs", 851}, - {", undelfs", 852}, - {"With builtin Editor\n", 853}, - {"Using ", 854}, - {"system-installed ", 855}, - {"S-lang library with ", 856}, - {"terminfo", 857}, - {"termcap", 858}, - {"an unknown terminal", 859}, - {" database", 860}, - {"the ncurses library", 861}, - {"some unknown curses library", 862}, - {"With subshell support: ", 863}, - {"optional", 864}, - {"as default", 865}, - {"With support for background operations\n", 866}, - {" Copy ", 867}, - {" Move ", 868}, - {" Delete ", 869}, - {" Invalid target mask ", 870}, - {" Could not make the hardlink ", 871}, +file as an example of how to write it.\n", 840}, + {"mc.ext will be used for this moment.", 841}, + {"Edition: ", 842}, + {"XView", 843}, + {"Tk", 844}, + {"text mode", 845}, + {" with X11 support to read modifiers", 846}, + {"Virtual File System: tarfs, extfs", 847}, + {", ftpfs", 848}, + {" (proxies: hsc proxy)", 849}, + {", mcfs", 850}, + {" (with termnet support)", 851}, + {", smbfs", 852}, + {", undelfs", 853}, + {"With builtin Editor\n", 854}, + {"Using ", 855}, + {"system-installed ", 856}, + {"S-lang library with ", 857}, + {"terminfo", 858}, + {"termcap", 859}, + {"an unknown terminal", 860}, + {" database", 861}, + {"the ncurses library", 862}, + {"some unknown curses library", 863}, + {"With subshell support: ", 864}, + {"optional", 865}, + {"as default", 866}, + {"With support for background operations\n", 867}, + {" Copy ", 868}, + {" Move ", 869}, + {" Delete ", 870}, + {" Invalid target mask ", 871}, + {" Could not make the hardlink ", 872}, {"\ Cannot read source link \"%s\" \n\ - %s ", 872}, + %s ", 873}, {"\ Cannot make stable symlinks across non-local filesystems: \n\ \n\ - Option Stable Symlinks will be disabled ", 873}, + Option Stable Symlinks will be disabled ", 874}, {"\ Cannot create target symlink \"%s\" \n\ - %s ", 874}, + %s ", 875}, {"\ Cannot overwrite directory \"%s\" \n\ - %s ", 875}, + %s ", 876}, {"\ Cannot stat source file \"%s\" \n\ - %s ", 876}, - {" `%s' and `%s' are the same file. ", 877}, + %s ", 877}, + {" `%s' and `%s' are the same file. ", 878}, {"\ Cannot create special file \"%s\" \n\ - %s ", 878}, + %s ", 879}, {"\ Cannot chown target file \"%s\" \n\ - %s ", 879}, + %s ", 880}, {"\ Cannot chmod target file \"%s\" \n\ - %s ", 880}, + %s ", 881}, {"\ Cannot open source file \"%s\" \n\ - %s ", 881}, - {" Reget failed, about to overwrite file ", 882}, + %s ", 882}, + {" Reget failed, about to overwrite file ", 883}, {"\ Cannot fstat source file \"%s\" \n\ - %s ", 883}, + %s ", 884}, {"\ Cannot create target file \"%s\" \n\ - %s ", 884}, + %s ", 885}, {"\ Cannot fstat target file \"%s\" \n\ - %s ", 885}, + %s ", 886}, {"\ Cannot read source file \"%s\" \n\ - %s ", 886}, + %s ", 887}, {"\ Cannot write target file \"%s\" \n\ - %s ", 887}, - {"(stalled)", 888}, + %s ", 888}, + {"(stalled)", 889}, {"\ Cannot close source file \"%s\" \n\ - %s ", 889}, + %s ", 890}, {"\ Cannot close target file \"%s\" \n\ - %s ", 890}, - {"Incomplete file was retrieved. Keep it?", 891}, - {"&Delete", 892}, - {"&Keep", 893}, + %s ", 891}, + {"Incomplete file was retrieved. Keep it?", 892}, + {"&Delete", 893}, + {"&Keep", 894}, {"\ Cannot stat source directory \"%s\" \n\ - %s ", 894}, + %s ", 895}, {"\ Source directory \"%s\" is not a directory \n\ - %s ", 895}, + %s ", 896}, {"\ Cannot copy cyclic symbolic link \n\ - `%s' ", 896}, + `%s' ", 897}, {"\ Cannot create target directory \"%s\" \n\ - %s ", 897}, + %s ", 898}, {"\ Cannot chown target directory \"%s\" \n\ - %s ", 898}, + %s ", 899}, {"\ Cannot stat file \"%s\" \n\ - %s ", 899}, - {" `%s' and `%s' are the same file ", 900}, - {" Cannot overwrite directory `%s' ", 901}, + %s ", 900}, + {" `%s' and `%s' are the same file ", 901}, + {" Cannot overwrite directory `%s' ", 902}, {"\ Cannot move file \"%s\" to \"%s\" \n\ - %s ", 902}, + %s ", 903}, {"\ Cannot remove file \"%s\" \n\ - %s ", 903}, - {" `%s' and `%s' are the same directory ", 904}, - {" Cannot overwrite directory \"%s\" %s ", 905}, - {" Cannot overwrite file \"%s\" %s ", 906}, + %s ", 904}, + {" `%s' and `%s' are the same directory ", 905}, + {" Cannot overwrite directory \"%s\" %s ", 906}, + {" Cannot overwrite file \"%s\" %s ", 907}, {"\ Cannot move directory \"%s\" to \"%s\" \n\ - %s ", 907}, + %s ", 908}, {"\ Cannot delete file \"%s\" \n\ - %s ", 908}, + %s ", 909}, {"\ Cannot remove directory \"%s\" \n\ - %s ", 909}, - {" Internal error: get_file \n", 910}, - {"1Copy", 911}, - {"1Move", 912}, - {"1Delete", 913}, - {"%o %f \"%s\"%m", 914}, - {"%o %d %f%m", 915}, - {"%o %f \"%s\"%e", 916}, - {"%o %d %f%e", 917}, - {"file", 918}, - {"files", 919}, - {"directory", 920}, - {"directories", 921}, - {"files/directories", 922}, - {" with source mask:", 923}, - {" Can't operate on \"..\"! ", 924}, - {"Yes", 925}, - {"No", 926}, - {" Sorry, I could not put the job in background ", 927}, - {" Internal failure ", 928}, - {" Unknown file operation ", 929}, + %s ", 910}, + {" Internal error: get_file \n", 911}, + {"1Copy", 912}, + {"1Move", 913}, + {"1Delete", 914}, + {"%o %f \"%s\"%m", 915}, + {"%o %d %f%m", 916}, + {"%o %f \"%s\"%e", 917}, + {"%o %d %f%e", 918}, + {"file", 919}, + {"files", 920}, + {"directory", 921}, + {"directories", 922}, + {"files/directories", 923}, + {" with source mask:", 924}, + {" Can't operate on \"..\"! ", 925}, + {"Yes", 926}, + {"No", 927}, + {" Sorry, I could not put the job in background ", 928}, + {" Internal failure ", 929}, + {" Unknown file operation ", 930}, {"\ Destination \"%s\" must be a directory \n\ - %s ", 930}, - {"&Retry", 931}, - {"&Abort", 932}, + %s ", 931}, + {"&Retry", 932}, + {"&Abort", 933}, {"\ \n\ Directory not empty. \n\ - Delete it recursively? ", 933}, + Delete it recursively? ", 934}, {"\ \n\ Background process: Directory not empty \n\ - Delete it recursively? ", 934}, - {"a&ll", 935}, - {"non&E", 936}, - {" Type 'yes' if you REALLY want to delete ", 937}, - {"all the directories ", 938}, - {" Recursive Delete ", 939}, - {" Background process: Recursive Delete ", 940}, - {"File", 941}, - {"Count", 942}, - {"Bytes", 943}, - {"Source", 944}, - {"Target", 945}, - {"Deleting", 946}, - {"Target file \"%s\" already exists!", 947}, - {"if &Size differs", 948}, - {"&Update", 949}, - {"Overwrite all targets?", 950}, - {"&Reget", 951}, - {"ap&Pend", 952}, - {"Overwrite this target?", 953}, - {"Target date: %s, size %d", 954}, - {"Source date: %s, size %d", 955}, - {" File exists ", 956}, - {" Background process: File exists ", 957}, - {"preserve &Attributes", 958}, - {"follow &Links", 959}, - {"to:", 960}, - {"&Using shell patterns", 961}, - {"&Background", 962}, - {"&Stable Symlinks", 963}, - {"&Dive into subdir if exists", 964}, + Delete it recursively? ", 935}, + {"a&ll", 936}, + {"non&E", 937}, + {" Type 'yes' if you REALLY want to delete ", 938}, + {"all the directories ", 939}, + {" Recursive Delete ", 940}, + {" Background process: Recursive Delete ", 941}, + {"File", 942}, + {"Count", 943}, + {"Bytes", 944}, + {"Source", 945}, + {"Target", 946}, + {"Deleting", 947}, + {"Target file \"%s\" already exists!", 948}, + {"if &Size differs", 949}, + {"&Update", 950}, + {"Overwrite all targets?", 951}, + {"&Reget", 952}, + {"ap&Pend", 953}, + {"Overwrite this target?", 954}, + {"Target date: %s, size %d", 955}, + {"Source date: %s, size %d", 956}, + {" File exists ", 957}, + {" Background process: File exists ", 958}, + {"preserve &Attributes", 959}, + {"follow &Links", 960}, + {"to:", 961}, + {"&Using shell patterns", 962}, + {"&Background", 963}, + {"&Stable Symlinks", 964}, + {"&Dive into subdir if exists", 965}, {"\ Invalid source pattern `%s' \n\ - %s ", 965}, - {"&Suspend", 966}, - {"Con&tinue", 967}, - {"&Chdir", 968}, - {"&Again", 969}, - {"&Quit", 970}, - {"Pane&lize", 971}, - {"&View - F3", 972}, - {"&Edit - F4", 973}, - {"Start at:", 974}, - {"Filename:", 975}, - {"Content: ", 976}, - {"&Tree", 977}, - {"Find File", 978}, - {"Grepping in %s", 979}, - {" Find/read ", 980}, - {" Problem reading from child ", 981}, - {"Finished", 982}, - {"Searching %s", 983}, - {"Suspend", 984}, - {"Restart", 985}, - {"Searching", 986}, - {"Find file", 987}, - {"Change to this directory", 988}, - {"Search again", 989}, - {"View this file", 990}, - {"Edit this file", 991}, - {"Send the results to a Panel", 992}, - {"Usage: fixhlp \n", 993}, - {"fixhlp: Cannot open toc for writing", 994}, + %s ", 966}, + {"&Suspend", 967}, + {"Con&tinue", 968}, + {"&Chdir", 969}, + {"&Again", 970}, + {"&Quit", 971}, + {"Pane&lize", 972}, + {"&View - F3", 973}, + {"&Edit - F4", 974}, + {"Start at:", 975}, + {"Filename:", 976}, + {"Content: ", 977}, + {"&Tree", 978}, + {"Find File", 979}, + {"Grepping in %s", 980}, + {" Find/read ", 981}, + {" Problem reading from child ", 982}, + {"Finished", 983}, + {"Searching %s", 984}, + {"Suspend", 985}, + {"Restart", 986}, + {"Searching", 987}, + {"Find file", 988}, + {"Change to this directory", 989}, + {"Search again", 990}, + {"View this file", 991}, + {"Edit this file", 992}, + {"Send the results to a Panel", 993}, + {"Usage: fixhlp \n", 994}, + {"fixhlp: Cannot open toc for writing", 995}, {"\ [Contents]\n\ Topics:\n\ -\n", 995}, +\n", 996}, {"\ Help file format error\n\ -", 996}, - {" Internal bug: Double start of link area ", 997}, - {" Can't find node [Contents] in help file ", 998}, - {" Help ", 999}, +", 997}, + {" Internal bug: Double start of link area ", 998}, + {" Can't find node [Contents] in help file ", 999}, + {" Help ", 1000}, {"\ Can't open file %s \n\ - %s ", 1000}, - {" Can't find node %s in help file ", 1001}, - {"Index", 1002}, - {"Prev", 1003}, - {"&Move", 1004}, - {"&Remove", 1005}, - {"&Append", 1006}, - {"&Insert", 1007}, - {"New &Entry", 1008}, - {"New &Group", 1009}, - {"&Up", 1010}, - {"&Add current", 1011}, - {"Change &To", 1012}, - {"Subgroup - press ENTER to see list", 1013}, - {"Active VFS directories", 1014}, - {"Directory hotlist", 1015}, - {" Directory path ", 1016}, - {" Directory label ", 1017}, - {"Moving ", 1018}, - {"New hotlist entry", 1019}, - {"Directory label", 1020}, - {"Directory path", 1021}, - {" New hotlist group ", 1022}, - {"Name of new group", 1023}, - {"Label for \"%s\":", 1024}, - {" Add to hotlist ", 1025}, - {" Remove: ", 1026}, + %s ", 1001}, + {" Can't find node %s in help file ", 1002}, + {"Index", 1003}, + {"Prev", 1004}, + {"&Move", 1005}, + {"&Remove", 1006}, + {"&Append", 1007}, + {"&Insert", 1008}, + {"New &Entry", 1009}, + {"New &Group", 1010}, + {"&Up", 1011}, + {"&Add current", 1012}, + {"Change &To", 1013}, + {"Subgroup - press ENTER to see list", 1014}, + {"Active VFS directories", 1015}, + {"Directory hotlist", 1016}, + {" Directory path ", 1017}, + {" Directory label ", 1018}, + {"Moving ", 1019}, + {"New hotlist entry", 1020}, + {"Directory label", 1021}, + {"Directory path", 1022}, + {" New hotlist group ", 1023}, + {"Name of new group", 1024}, + {"Label for \"%s\":", 1025}, + {" Add to hotlist ", 1026}, + {" Remove: ", 1027}, {"\ \n\ Group not empty.\n\ - Remove it?", 1027}, - {" Top level group ", 1028}, - {"Hotlist is now kept in file ~/", 1029}, - {"MC will load hotlist from ~/", 1030}, - {"and then delete [Hotlist] section there", 1031}, - {" Hotlist Load ", 1032}, - {"MC was unable to write ~/", 1033}, - {" file, your old hotlist entries were not deleted", 1034}, - {"You have ~/", 1035}, - {" file and [Hotlist] section in ~/", 1036}, - {"Your ~/", 1037}, - {" most probably was created\n", 1038}, + Remove it?", 1028}, + {" Top level group ", 1029}, + {"Hotlist is now kept in file ~/", 1030}, + {"MC will load hotlist from ~/", 1031}, + {"and then delete [Hotlist] section there", 1032}, + {" Hotlist Load ", 1033}, + {"MC was unable to write ~/", 1034}, + {" file, your old hotlist entries were not deleted", 1035}, + {"You have ~/", 1036}, + {" file and [Hotlist] section in ~/", 1037}, + {"Your ~/", 1038}, + {" most probably was created\n", 1039}, {"\ by an earlier development version of MC\n\ -and is more actual than ~/", 1039}, +and is more actual than ~/", 1040}, {"\ entries\n\ -\n", 1040}, +\n", 1041}, {"\ You can choose between\n\ \n\ - Remove - remove old hotlist entries from ~/", 1041}, + Remove - remove old hotlist entries from ~/", 1042}, {"\ Keep - keep your old entries; you will be asked\n\ the same question next time\n\ - Merge - add old entries to hotlist as group \"Entries from ~/", 1042}, - {"&Merge", 1043}, - {" Entries from ~/", 1044}, - {" file your old hotlist entries were not deleted", 1045}, - {"Midnight Commander %s", 1046}, - {"File: %s", 1047}, - {"Free nodes %d (%d%%) of %d", 1048}, - {"No node information", 1049}, - {"Free space ", 1050}, - {" (%d%%) of ", 1051}, - {"No space information", 1052}, - {"Type: %s ", 1053}, - {"non-local vfs", 1054}, - {"Device: %s", 1055}, - {"Filesystem: %s", 1056}, - {"Accessed: %s", 1057}, - {"Modified: %s", 1058}, - {"Created: %s", 1059}, - {"Size: ", 1060}, - {" (%d blocks)", 1061}, - {"Owner: %s/%s", 1062}, - {"Links: %d", 1063}, - {"Mode: %s (%04o)", 1064}, - {"Location: %Xh:%Xh", 1065}, - {"File: None", 1066}, - {"&Vertical", 1067}, - {"&Horizontal", 1068}, - {"&Xterm hintbar", 1069}, - {"h&Intbar visible", 1070}, - {"&Keybar visible", 1071}, - {"command &Prompt", 1072}, - {"show &Mini status", 1073}, - {"menu&Bar visible", 1074}, - {"&Equal split", 1075}, - {"pe&Rmissions", 1076}, - {"&File types", 1077}, - {"&Save", 1078}, - {" Layout ", 1079}, - {" Panel split ", 1080}, - {" Highlight... ", 1081}, - {" Other options ", 1082}, - {"output lines", 1083}, - {"Layout", 1084}, - {" Learn keys ", 1085}, - {" Teach me a key ", 1086}, + Merge - add old entries to hotlist as group \"Entries from ~/", 1043}, + {"&Merge", 1044}, + {" Entries from ~/", 1045}, + {" file your old hotlist entries were not deleted", 1046}, + {"Midnight Commander %s", 1047}, + {"File: %s", 1048}, + {"Free nodes %d (%d%%) of %d", 1049}, + {"No node information", 1050}, + {"Free space ", 1051}, + {" (%d%%) of ", 1052}, + {"No space information", 1053}, + {"Type: %s ", 1054}, + {"non-local vfs", 1055}, + {"Device: %s", 1056}, + {"Filesystem: %s", 1057}, + {"Accessed: %s", 1058}, + {"Modified: %s", 1059}, + {"Created: %s", 1060}, + {"Size: ", 1061}, + {" (%d blocks)", 1062}, + {"Owner: %s/%s", 1063}, + {"Links: %d", 1064}, + {"Mode: %s (%04o)", 1065}, + {"Location: %Xh:%Xh", 1066}, + {"File: None", 1067}, + {"&Vertical", 1068}, + {"&Horizontal", 1069}, + {"&Xterm hintbar", 1070}, + {"h&Intbar visible", 1071}, + {"&Keybar visible", 1072}, + {"command &Prompt", 1073}, + {"show &Mini status", 1074}, + {"menu&Bar visible", 1075}, + {"&Equal split", 1076}, + {"pe&Rmissions", 1077}, + {"&File types", 1078}, + {"&Save", 1079}, + {" Layout ", 1080}, + {" Panel split ", 1081}, + {" Highlight... ", 1082}, + {" Other options ", 1083}, + {"output lines", 1084}, + {"Layout", 1085}, + {" Learn keys ", 1086}, + {" Teach me a key ", 1087}, {"\ Please press the %s\n\ and then wait until this message disappears.\n\ @@ -1304,141 +1310,141 @@ next to its button.\n\ \n\ If you want to escape, press a single Escape key\n\ -and wait as well.", 1087}, - {" Cannot accept this key ", 1088}, - {" You have entered \"%s\"", 1089}, - {"OK", 1090}, +and wait as well.", 1088}, + {" Cannot accept this key ", 1089}, + {" You have entered \"%s\"", 1090}, + {"OK", 1091}, {"\ It seems that all your keys already\n\ -work fine. That's great.", 1091}, - {"&Discard", 1092}, +work fine. That's great.", 1092}, + {"&Discard", 1093}, {"\ Great! You have a complete terminal database!\n\ -All your keys work well.", 1093}, - {"Learn keys", 1094}, - {"Press all the keys mentioned here. After you have done it, check", 1095}, - {"which keys are not marked with OK. Press space on the missing", 1096}, - {"key, or click with the mouse to define it. Move around with Tab.", 1097}, +All your keys work well.", 1094}, + {"Learn keys", 1095}, + {"Press all the keys mentioned here. After you have done it, check", 1096}, + {"which keys are not marked with OK. Press space on the missing", 1097}, + {"key, or click with the mouse to define it. Move around with Tab.", 1098}, {"\ The Commander can't change to the directory that \n\ the subshell claims you are in. Perhaps you have \n\ deleted your working directory, or given yourself \n\ - extra access permissions with the \"su\" command? ", 1098}, - {"Press any key to continue...", 1099}, - {" The shell is already running a command ", 1100}, - {" The Midnight Commander ", 1101}, - {" Do you really want to quit the Midnight Commander? ", 1102}, - {"&Listing mode...", 1103}, - {"&Quick view C-x q", 1104}, - {"&Info C-x i", 1105}, - {"&Sort order...", 1106}, - {"&Filter...", 1107}, - {"&Network link...", 1108}, - {"FT&P link...", 1109}, - {"SM&B link...", 1110}, - {"&Drive... M-d", 1111}, - {"&Rescan C-r", 1112}, - {"&User menu F2", 1113}, - {"&View F3", 1114}, - {"Vie&w file... ", 1115}, - {"&Filtered view M-!", 1116}, - {"&Edit F4", 1117}, - {"&Copy F5", 1118}, - {"c&Hmod C-x c", 1119}, - {"&Link C-x l", 1120}, - {"&SymLink C-x s", 1121}, - {"edit s&Ymlink C-x C-s", 1122}, - {"ch&Own C-x o", 1123}, - {"&Advanced chown ", 1124}, - {"&Rename/Move F6", 1125}, - {"&Mkdir F7", 1126}, - {"&Delete F8", 1127}, - {"&Quick cd M-c", 1128}, - {"select &Group M-+", 1129}, - {"u&Nselect group M-\\", 1130}, - {"reverse selec&Tion M-*", 1131}, - {"e&Xit F10", 1132}, - {"&Directory tree", 1133}, - {"&Find file M-?", 1134}, - {"s&Wap panels C-u", 1135}, - {"switch &Panels on/off C-o", 1136}, - {"&Compare directories C-x d", 1137}, - {"e&Xternal panelize C-x !", 1138}, - {"show directory s&Izes", 1139}, - {"command &History", 1140}, - {"di&Rectory hotlist C-\\", 1141}, - {"&Active VFS list C-x a", 1142}, - {"Fr&ee VFSs now", 1143}, - {"&Background jobs C-x j", 1144}, - {"&Undelete files (ext2fs only)", 1145}, - {"&Listing format edit", 1146}, - {"&Extension file edit", 1147}, - {"&Menu file edit", 1148}, - {"Menu edi&Tor edit", 1149}, - {"&Configuration...", 1150}, - {"c&Onfirmation...", 1151}, - {"&Display bits...", 1152}, - {"learn &Keys...", 1153}, - {"&Virtual FS...", 1154}, - {"&Save setup", 1155}, - {" &Left ", 1156}, - {" &Above ", 1157}, - {" &File ", 1158}, - {" &Command ", 1159}, - {" &Options ", 1160}, - {" &Right ", 1161}, - {" &Below ", 1162}, - {" Information ", 1163}, + extra access permissions with the \"su\" command? ", 1099}, + {"Press any key to continue...", 1100}, + {" The shell is already running a command ", 1101}, + {" The Midnight Commander ", 1102}, + {" Do you really want to quit the Midnight Commander? ", 1103}, + {"&Listing mode...", 1104}, + {"&Quick view C-x q", 1105}, + {"&Info C-x i", 1106}, + {"&Sort order...", 1107}, + {"&Filter...", 1108}, + {"&Network link...", 1109}, + {"FT&P link...", 1110}, + {"SM&B link...", 1111}, + {"&Drive... M-d", 1112}, + {"&Rescan C-r", 1113}, + {"&User menu F2", 1114}, + {"&View F3", 1115}, + {"Vie&w file... ", 1116}, + {"&Filtered view M-!", 1117}, + {"&Edit F4", 1118}, + {"&Copy F5", 1119}, + {"c&Hmod C-x c", 1120}, + {"&Link C-x l", 1121}, + {"&SymLink C-x s", 1122}, + {"edit s&Ymlink C-x C-s", 1123}, + {"ch&Own C-x o", 1124}, + {"&Advanced chown ", 1125}, + {"&Rename/Move F6", 1126}, + {"&Mkdir F7", 1127}, + {"&Delete F8", 1128}, + {"&Quick cd M-c", 1129}, + {"select &Group M-+", 1130}, + {"u&Nselect group M-\\", 1131}, + {"reverse selec&Tion M-*", 1132}, + {"e&Xit F10", 1133}, + {"&Directory tree", 1134}, + {"&Find file M-?", 1135}, + {"s&Wap panels C-u", 1136}, + {"switch &Panels on/off C-o", 1137}, + {"&Compare directories C-x d", 1138}, + {"e&Xternal panelize C-x !", 1139}, + {"show directory s&Izes", 1140}, + {"command &History", 1141}, + {"di&Rectory hotlist C-\\", 1142}, + {"&Active VFS list C-x a", 1143}, + {"Fr&ee VFSs now", 1144}, + {"&Background jobs C-x j", 1145}, + {"&Undelete files (ext2fs only)", 1146}, + {"&Listing format edit", 1147}, + {"&Extension file edit", 1148}, + {"&Menu file edit", 1149}, + {"Menu edi&Tor edit", 1150}, + {"&Configuration...", 1151}, + {"c&Onfirmation...", 1152}, + {"&Display bits...", 1153}, + {"learn &Keys...", 1154}, + {"&Virtual FS...", 1155}, + {"&Save setup", 1156}, + {" &Left ", 1157}, + {" &Above ", 1158}, + {" &File ", 1159}, + {" &Command ", 1160}, + {" &Options ", 1161}, + {" &Right ", 1162}, + {" &Below ", 1163}, + {" Information ", 1164}, {"\ Using the fast reload option may not reflect the exact \n\ directory contents. In this cases you'll need to do a \n\ manual reload of the directory. See the man page for \n\ - the details. ", 1164}, - {"Thank you for using GNU Midnight Commander", 1165}, - {"with mouse support on xterm and the Linux console.\n", 1166}, - {"with mouse support on xterm.\n", 1167}, - {"The TERM environment variable is unset!\n", 1168}, + the details. ", 1165}, + {"Thank you for using GNU Midnight Commander", 1166}, + {"with mouse support on xterm and the Linux console.\n", 1167}, + {"with mouse support on xterm.\n", 1168}, + {"The TERM environment variable is unset!\n", 1169}, {"\ Usage is:\n\ \n\ mc [flags] [this_dir] [other_panel_dir]\n\ -\n", 1169}, - {"-a, --stickchars Force use of +, -, | for line drawing.\n", 1170}, - {"-b, --nocolor Force black and white display.\n", 1171}, - {"-B, --background [DEVEL-ONLY: Debug the background code]\n", 1172}, +\n", 1170}, + {"-a, --stickchars Force use of +, -, | for line drawing.\n", 1171}, + {"-b, --nocolor Force black and white display.\n", 1172}, + {"-B, --background [DEVEL-ONLY: Debug the background code]\n", 1173}, {"\ -c, --color Force color mode.\n\ -C, --colors Specify colors (use --help-colors to get a list).\n\ --d, --nomouse Disable mouse support.\n", 1173}, - {"-e, --edit Startup the internal editor.\n", 1174}, +-d, --nomouse Disable mouse support.\n", 1174}, + {"-e, --edit Startup the internal editor.\n", 1175}, {"\ -f, --libdir Print configured paths.\n\ -h, --help Shows this help message.\n\ -k, --resetsoft Reset softkeys (HP terminals only) to their \ terminfo/termcap\n\ - default.\n", 1175}, - {"-l, --ftplog file Log ftpfs commands to the file.\n", 1176}, - {"-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n", 1177}, + default.\n", 1176}, + {"-l, --ftplog file Log ftpfs commands to the file.\n", 1177}, + {"-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n", 1178}, {"\ -P, --printwd At exit, print the last working directory.\n\ --s, --slow Disables verbose operation (for slow terminals).\n", 1178}, - {"-t, --termcap Activate support for the TERMCAP variable.\n", 1179}, +-s, --slow Disables verbose operation (for slow terminals).\n", 1179}, + {"-t, --termcap Activate support for the TERMCAP variable.\n", 1180}, {"\ --S, --createcmdile Create command file to set default directory upon exit.\n", 1180}, +-S, --createcmdile Create command file to set default directory upon exit.\n", 1181}, {"\ -u, --nosubshell Disable the concurrent subshell mode.\n\ -U, --subshell Force the concurrent subshell mode.\n\ --r, --forceexec Force subshell execution.\n", 1181}, +-r, --forceexec Force subshell execution.\n", 1182}, {"\ -v, --view fname Start up into the viewer mode.\n\ -V, --version Report version and configuration options.\n\ -x, --xterm Force xterm mouse support and screen save/restore.\n\ -+number number it is the start line number of file for `mcedit'.\n", 1182}, - {"-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n", 1183}, ++number number it is the start line number of file for `mcedit'.\n", 1183}, + {"-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n", 1184}, {"\ \n\ Please send any bug reports (including the output of `mc -V')\n\ -to mc-bugs@nuclecu.unam.mx\n", 1184}, +to mc-bugs@nuclecu.unam.mx\n", 1185}, {"\ --colors KEYWORD={FORE},{BACK}\n\ \n\ @@ -1456,393 +1462,396 @@ black, gray, red, brightred, green, brightgreen, brown,\n\ yellow, blue, brightblue, magenta, brightmagenta, cyan,\n\ brightcyan, lightgray and white\n\ -\n", 1185}, - {"Library directory for the Midnight Commander: %s\n", 1186}, +\n", 1186}, + {"Library directory for the Midnight Commander: %s\n", 1187}, {"\ -Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 1187}, - {"Use to debug the background code", 1188}, - {"Request to run in color mode", 1189}, - {"Specifies a color configuration", 1190}, - {"Edits one file", 1191}, - {"Displays this help message", 1192}, - {"Displays a help screen on how to change the color scheme", 1193}, - {"Log ftp dialog to specified file", 1194}, - {"Obsolete", 1195}, - {"Requests to run in black and white", 1196}, - {"Disable mouse support in text version", 1197}, - {"Disables subshell support", 1198}, - {"Prints working directory at program exit", 1199}, - {"Resets soft keys on HP terminals", 1200}, - {"To run on slow terminals", 1201}, - {"Use stickchars to draw", 1202}, - {"Enables subshell support (default)", 1203}, - {"Tries to use termcap instead of terminfo", 1204}, - {"Displays the current version", 1205}, - {"Launches the file viewer on a file", 1206}, - {"Forces xterm features", 1207}, - {"Geometry for the window", 1208}, - {"GEOMETRY", 1209}, - {"No windows opened at startup", 1210}, - {"No desktop icons", 1211}, - {"Look more like traditional gmc", 1212}, - {"Display the directory that holds the .links startup files and exit", 1213}, +Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 1188}, + {"Use to debug the background code", 1189}, + {"Request to run in color mode", 1190}, + {"Specifies a color configuration", 1191}, + {"Edits one file", 1192}, + {"Displays this help message", 1193}, + {"Displays a help screen on how to change the color scheme", 1194}, + {"Log ftp dialog to specified file", 1195}, + {"Obsolete", 1196}, + {"Requests to run in black and white", 1197}, + {"Disable mouse support in text version", 1198}, + {"Disables subshell support", 1199}, + {"Prints working directory at program exit", 1200}, + {"Resets soft keys on HP terminals", 1201}, + {"To run on slow terminals", 1202}, + {"Use stickchars to draw", 1203}, + {"Enables subshell support (default)", 1204}, + {"Tries to use termcap instead of terminfo", 1205}, + {"Displays the current version", 1206}, + {"Launches the file viewer on a file", 1207}, + {"Forces xterm features", 1208}, + {"Geometry for the window", 1209}, + {"GEOMETRY", 1210}, + {"No windows opened at startup", 1211}, + {"No desktop icons", 1212}, + {"Look more like traditional gmc", 1213}, + {"Display the directory that holds the .links startup files and exit", 1214}, {"\ Couldn't open tty line. You have to run mc without the -P flag.\n\ -On some systems you may want to run # `which mc`\n", 1214}, - {" Notice ", 1215}, +On some systems you may want to run # `which mc`\n", 1215}, + {" Notice ", 1216}, {"\ The Midnight Commander configuration files \n\ are now stored in the ~/.mc directory, the \n\ - files have been moved now\n", 1216}, - {"safe de&Lete", 1217}, - {"cd follows lin&Ks", 1218}, - {"advanced cho&Wn", 1219}, - {"l&Ynx-like motion", 1220}, - {"Animation", 1221}, - {"rotatin&G dash", 1222}, - {"co&Mplete: show all", 1223}, - {"&Use internal view", 1224}, - {"use internal ed&It", 1225}, - {"auto m&Enus", 1226}, - {"&Auto save setup", 1227}, - {"shell &Patterns", 1228}, - {"Compute &Totals", 1229}, - {"&Verbose operation", 1230}, - {"&Fast dir reload", 1231}, - {"mi&X all files", 1232}, - {"&Drop down menus", 1233}, - {"ma&Rk moves down", 1234}, - {"show &Hidden files", 1235}, - {"show &Backup files", 1236}, - {"&Never", 1237}, - {"on dumb &Terminals", 1238}, - {"alwa&Ys", 1239}, - {" Configure options ", 1240}, - {" Panel options ", 1241}, - {" Pause after run... ", 1242}, - {"Configure options", 1243}, - {"&Add new", 1244}, - {" External panelize ", 1245}, - {"External panelize", 1246}, - {"Other command", 1247}, - {" Add to external panelize ", 1248}, - {" Enter command label: ", 1249}, - {" I can't run external panelize while logged on a non local directory ", 1250}, - {"Find *.orig after patching", 1251}, - {"Find SUID and SGID programs", 1252}, - {"Cannot invoke command.", 1253}, - {"Pipe close failed", 1254}, - {"Show this help message", 1255}, - {"Display brief usage message", 1256}, - {"SUB-DIR", 1257}, - {"UP--DIR", 1258}, - {"MTime", 1259}, - {"ATime", 1260}, - {"CTime", 1261}, - {"Perm", 1262}, - {"Nl", 1263}, - {"Inode", 1264}, - {"UID", 1265}, - {"GID", 1266}, - {" %s bytes in %d file%s", 1267}, - {"Unknow tag on display format: ", 1268}, - {"User suplied format looks invalid, reverting to default.", 1269}, - {" Do you really want to execute? ", 1270}, - {" No action taken ", 1271}, - {"RenMov", 1272}, - {"Mkdir", 1273}, + files have been moved now\n", 1217}, + {"safe de&Lete", 1218}, + {"cd follows lin&Ks", 1219}, + {"advanced cho&Wn", 1220}, + {"l&Ynx-like motion", 1221}, + {"Animation", 1222}, + {"rotatin&G dash", 1223}, + {"co&Mplete: show all", 1224}, + {"&Use internal view", 1225}, + {"use internal ed&It", 1226}, + {"auto m&Enus", 1227}, + {"&Auto save setup", 1228}, + {"shell &Patterns", 1229}, + {"Compute &Totals", 1230}, + {"&Verbose operation", 1231}, + {"&Fast dir reload", 1232}, + {"mi&X all files", 1233}, + {"&Drop down menus", 1234}, + {"ma&Rk moves down", 1235}, + {"show &Hidden files", 1236}, + {"show &Backup files", 1237}, + {"&Never", 1238}, + {"on dumb &Terminals", 1239}, + {"alwa&Ys", 1240}, + {" Configure options ", 1241}, + {" Panel options ", 1242}, + {" Pause after run... ", 1243}, + {"Configure options", 1244}, + {"&Add new", 1245}, + {" External panelize ", 1246}, + {"External panelize", 1247}, + {"Other command", 1248}, + {" Add to external panelize ", 1249}, + {" Enter command label: ", 1250}, + {" I can't run external panelize while logged on a non local directory ", 1251}, + {"Find *.orig after patching", 1252}, + {"Find SUID and SGID programs", 1253}, + {"Cannot invoke command.", 1254}, + {"Pipe close failed", 1255}, + {"Show this help message", 1256}, + {"Display brief usage message", 1257}, + {"SUB-DIR", 1258}, + {"UP--DIR", 1259}, + {"MTime", 1260}, + {"ATime", 1261}, + {"CTime", 1262}, + {"Perm", 1263}, + {"Nl", 1264}, + {"Inode", 1265}, + {"UID", 1266}, + {"GID", 1267}, + {" %s bytes in %d file%s", 1268}, + {"Unknow tag on display format: ", 1269}, + {"User suplied format looks invalid, reverting to default.", 1270}, + {" Do you really want to execute? ", 1271}, + {" No action taken ", 1272}, + {"RenMov", 1273}, + {"Mkdir", 1274}, {"\ Can't chdir to \"%s\" \n\ - %s ", 1274}, - {"Couldn't open named pipe %s\n", 1275}, - {" The shell is still active. Quit anyway? ", 1276}, - {" There are stopped jobs.", 1277}, - {" Quit anyway? ", 1278}, - {"Warning: Couldn't change to %s.\n", 1279}, + %s ", 1275}, + {"Couldn't open named pipe %s\n", 1276}, + {" The shell is still active. Quit anyway? ", 1277}, + {" There are stopped jobs.", 1278}, + {" Quit anyway? ", 1279}, + {"Warning: Couldn't change to %s.\n", 1280}, {"\ Can't open the %s file for writing:\n\ -%s\n", 1280}, - {"Copy \"%s\" directory to:", 1281}, - {"Move \"%s\" directory to:", 1282}, +%s\n", 1281}, + {"Copy \"%s\" directory to:", 1282}, + {"Move \"%s\" directory to:", 1283}, {"\ Can't stat the destination \n\ - %s ", 1283}, - {" The destination isn't a directory ", 1284}, - {" Delete %s? ", 1285}, - {"Static", 1286}, - {"Dynamc", 1287}, - {"Forget", 1288}, - {"Rmdir", 1289}, + %s ", 1284}, + {" The destination isn't a directory ", 1285}, + {" Delete %s? ", 1286}, + {"Static", 1287}, + {"Dynamc", 1288}, + {"Forget", 1289}, + {"Rmdir", 1290}, {"\ Can't write to the %s file:\n\ -%s\n", 1290}, - {" Invalid shell pattern definition \"%c\". ", 1291}, - {" Debug ", 1292}, - {" ERROR: ", 1293}, - {" True: ", 1294}, - {" False: ", 1295}, - {" Warning -- ignoring file ", 1296}, +%s\n", 1291}, + {" Format error on file Extensions File ", 1292}, + {" The %%var macro does not have a default ", 1293}, + {" The %%var macros does not have a variable ", 1294}, + {" Invalid shell pattern definition \"%c\". ", 1295}, + {" Debug ", 1296}, + {" ERROR: ", 1297}, + {" True: ", 1298}, + {" False: ", 1299}, + {" Warning -- ignoring file ", 1300}, {"\ File %s is not owned by root or you or is world writable.\n\ -Using it may compromise your security", 1297}, - {" I can't run programs while logged on a non local directory ", 1298}, - {" Empty file %s ", 1299}, - {" User menu ", 1300}, - {"name_trunc: too big", 1301}, - {"%b %e %H:%M", 1302}, - {"%b %e %Y", 1303}, - {" Pipe failed ", 1304}, - {" Dup failed ", 1305}, +Using it may compromise your security", 1301}, + {" I can't run programs while logged on a non local directory ", 1302}, + {" No appropriative entries found in %s ", 1303}, + {" User menu ", 1304}, + {"name_trunc: too big", 1305}, + {"%b %e %H:%M", 1306}, + {"%b %e %Y", 1307}, + {" Pipe failed ", 1308}, + {" Dup failed ", 1309}, {"\ File: \n\ \n\ - ", 1306}, + ", 1310}, {"\ \n\ \n\ -has been modified, do you want to save the changes?\n", 1307}, - {" Save changes ", 1308}, - {" Can't spawn child program ", 1309}, - {" Empty output from child filter ", 1310}, - {" Could not open file ", 1311}, - {" Can't open file \"", 1312}, +has been modified, do you want to save the changes?\n", 1311}, + {" Save changes ", 1312}, + {" Can't spawn child program ", 1313}, + {" Empty output from child filter ", 1314}, + {" Could not open file ", 1315}, + {" Can't open file \"", 1316}, {"\ Can't stat file \n\ - ", 1313}, - {" Can't view: not a regular file ", 1314}, + ", 1317}, + {" Can't view: not a regular file ", 1318}, {"\ Can't open \"%s\"\n\ - %s ", 1315}, + %s ", 1319}, {"\ Can't stat \"%s\"\n\ - %s ", 1316}, - {"File: %s", 1317}, - {"Offset 0x%08x", 1318}, - {" [grow]", 1319}, - {"Searching for `%s'", 1320}, - {" Search string not found ", 1321}, - {" Invalid regular expression ", 1322}, + %s ", 1320}, + {"File: %s", 1321}, + {"Offset 0x%08x", 1322}, + {" [grow]", 1323}, + {"Searching for `%s'", 1324}, + {" Search string not found ", 1325}, + {" Invalid regular expression ", 1326}, {"\ The current line number is %d.\n\ - Enter the new line number:", 1323}, + Enter the new line number:", 1327}, {"\ The current address is 0x%lx.\n\ - Enter the new address:", 1324}, - {" Goto Address ", 1325}, - {" Enter regexp:", 1326}, - {"Ascii", 1327}, - {"Hex", 1328}, - {"Goto", 1329}, - {"Line", 1330}, - {"RxSrch", 1331}, - {"EdText", 1332}, - {"EdHex", 1333}, - {"UnWrap", 1334}, - {"Wrap", 1335}, - {"HxSrch", 1336}, - {"Raw", 1337}, - {"Parse", 1338}, - {"Unform", 1339}, - {"Format", 1340}, - {" History ", 1341}, - {"Function key 1", 1342}, - {"Function key 2", 1343}, - {"Function key 3", 1344}, - {"Function key 4", 1345}, - {"Function key 5", 1346}, - {"Function key 6", 1347}, - {"Function key 7", 1348}, - {"Function key 8", 1349}, - {"Function key 9", 1350}, - {"Function key 10", 1351}, - {"Function key 11", 1352}, - {"Function key 12", 1353}, - {"Function key 13", 1354}, - {"Function key 14", 1355}, - {"Function key 15", 1356}, - {"Function key 16", 1357}, - {"Function key 17", 1358}, - {"Function key 18", 1359}, - {"Function key 19", 1360}, - {"Function key 20", 1361}, - {"Backspace key", 1362}, - {"End key", 1363}, - {"Up arrow key", 1364}, - {"Down arrow key", 1365}, - {"Left arrow key", 1366}, - {"Right arrow key", 1367}, - {"Home key", 1368}, - {"Page Down key", 1369}, - {"Page Up key", 1370}, - {"Insert key", 1371}, - {"Delete key", 1372}, - {"Completion/M-tab", 1373}, - {"+ on keypad", 1374}, - {"- on keypad", 1375}, - {"* on keypad", 1376}, - {"Left arrow keypad", 1377}, - {"Right arrow keypad", 1378}, - {"Up arrow keypad", 1379}, - {"Down arrow keypad", 1380}, - {"Home on keypad", 1381}, - {"End on keypad", 1382}, - {"Page Down keypad", 1383}, - {"Page Up keypad", 1384}, - {"Insert on keypad", 1385}, - {"Delete on keypad", 1386}, - {"Enter on keypad", 1387}, - {"Slash on keypad", 1388}, - {"NumLock on keypad", 1389}, + Enter the new address:", 1328}, + {" Goto Address ", 1329}, + {" Enter regexp:", 1330}, + {"Ascii", 1331}, + {"Hex", 1332}, + {"Goto", 1333}, + {"Line", 1334}, + {"RxSrch", 1335}, + {"EdText", 1336}, + {"EdHex", 1337}, + {"UnWrap", 1338}, + {"Wrap", 1339}, + {"HxSrch", 1340}, + {"Raw", 1341}, + {"Parse", 1342}, + {"Unform", 1343}, + {"Format", 1344}, + {" History ", 1345}, + {"Function key 1", 1346}, + {"Function key 2", 1347}, + {"Function key 3", 1348}, + {"Function key 4", 1349}, + {"Function key 5", 1350}, + {"Function key 6", 1351}, + {"Function key 7", 1352}, + {"Function key 8", 1353}, + {"Function key 9", 1354}, + {"Function key 10", 1355}, + {"Function key 11", 1356}, + {"Function key 12", 1357}, + {"Function key 13", 1358}, + {"Function key 14", 1359}, + {"Function key 15", 1360}, + {"Function key 16", 1361}, + {"Function key 17", 1362}, + {"Function key 18", 1363}, + {"Function key 19", 1364}, + {"Function key 20", 1365}, + {"Backspace key", 1366}, + {"End key", 1367}, + {"Up arrow key", 1368}, + {"Down arrow key", 1369}, + {"Left arrow key", 1370}, + {"Right arrow key", 1371}, + {"Home key", 1372}, + {"Page Down key", 1373}, + {"Page Up key", 1374}, + {"Insert key", 1375}, + {"Delete key", 1376}, + {"Completion/M-tab", 1377}, + {"+ on keypad", 1378}, + {"- on keypad", 1379}, + {"* on keypad", 1380}, + {"Left arrow keypad", 1381}, + {"Right arrow keypad", 1382}, + {"Up arrow keypad", 1383}, + {"Down arrow keypad", 1384}, + {"Home on keypad", 1385}, + {"End on keypad", 1386}, + {"Page Down keypad", 1387}, + {"Page Up keypad", 1388}, + {"Insert on keypad", 1389}, + {"Delete on keypad", 1390}, + {"Enter on keypad", 1391}, + {"Slash on keypad", 1392}, + {"NumLock on keypad", 1393}, {"\ Couldn't open cpio archive\n\ -%s", 1390}, +%s", 1394}, {"\ Premature end of cpio archive\n\ -%s", 1391}, +%s", 1395}, {"\ Corrupt cpio header encountered in\n\ -%s", 1392}, +%s", 1396}, {"\ Inconsistent hardlinks of\n\ %s\n\ in cpio archive\n\ -%s", 1393}, - {"%s contains duplicit entries! Skiping!", 1394}, +%s", 1397}, + {"%s contains duplicit entries! Skiping!", 1398}, {"\ Unexpected end of file\n\ -%s", 1395}, - {"Dir cache expired for %s", 1396}, - {" Direntry warning ", 1397}, - {"Super ino_usage is %d, memory leak", 1398}, - {"Super has want_stale set", 1399}, - {"Starting linear transfer...", 1400}, - {"Getting file", 1401}, +%s", 1399}, + {"Dir cache expired for %s", 1400}, + {" Direntry warning ", 1401}, + {"Super ino_usage is %d, memory leak", 1402}, + {"Super has want_stale set", 1403}, + {"Starting linear transfer...", 1404}, + {"Getting file", 1405}, {"\ Couldn't open %s archive\n\ -%s", 1402}, - {"Inconsistent extfs archive", 1403}, - {"fish: Disconnecting from %s", 1404}, - {"fish: Waiting for initial line...", 1405}, - {"Sorry, we can not do password authenticated connections for now.", 1406}, - {" fish: Password required for ", 1407}, - {"fish: Sending password...", 1408}, - {"fish: Sending initial line...", 1409}, - {"fish: Handshaking version...", 1410}, - {"fish: Setting up current directory...", 1411}, - {"fish: Connected, home %s.", 1412}, - {"fish: Reading directory %s...", 1413}, - {"fish: failed", 1414}, - {"fish: store %s: sending command...", 1415}, - {"fish: Local read failed, sending zeros", 1416}, - {"fish: storing %s %d (%d)", 1417}, - {"zeros", 1418}, - {"Aborting transfer...", 1419}, - {"Error reported after abort.", 1420}, - {"Aborted transfer would be successful.", 1421}, - {"ftpfs: Disconnecting from %s", 1422}, - {" FTP: Password required for ", 1423}, - {" Proxy: Password required for ", 1424}, - {"ftpfs: sending proxy login name", 1425}, - {"ftpfs: sending proxy user password", 1426}, - {"ftpfs: proxy authentication succeeded", 1427}, - {"ftpfs: connected to %s", 1428}, - {"ftpfs: sending login name", 1429}, - {"ftpfs: sending user password", 1430}, - {"ftpfs: logged in", 1431}, - {"ftpfs: Login incorrect for user %s ", 1432}, - {" Could not set source routing (%s)", 1433}, - {"ftpfs: Invalid host name.", 1434}, - {"ftpfs: Invalid host address.", 1435}, - {"ftpfs: making connection to %s", 1436}, - {"ftpfs: connection interrupted by user", 1437}, - {"ftpfs: connection to server failed: %s", 1438}, - {"Waiting to retry... %d (Control-C to cancel)", 1439}, - {"ftpfs: could not setup passive mode", 1440}, - {"ftpfs: aborting transfer.", 1441}, - {"ftpfs: abort error: %s", 1442}, - {"ftpfs: abort failed", 1443}, - {"ftpfs: CWD failed.", 1444}, - {"ftpfs: couldn't resolve symlink", 1445}, - {"Resolving symlink...", 1446}, - {"ftpfs: Reading FTP directory %s... %s%s", 1447}, - {"(strict rfc959)", 1448}, - {"(chdir first)", 1449}, - {"ftpfs: failed", 1450}, - {"ftpfs: failed; nowhere to fallback to", 1451}, - {"ftpfs: storing file %d (%d)", 1452}, +%s", 1406}, + {"Inconsistent extfs archive", 1407}, + {"fish: Disconnecting from %s", 1408}, + {"fish: Waiting for initial line...", 1409}, + {"Sorry, we can not do password authenticated connections for now.", 1410}, + {" fish: Password required for ", 1411}, + {"fish: Sending password...", 1412}, + {"fish: Sending initial line...", 1413}, + {"fish: Handshaking version...", 1414}, + {"fish: Setting up current directory...", 1415}, + {"fish: Connected, home %s.", 1416}, + {"fish: Reading directory %s...", 1417}, + {"fish: failed", 1418}, + {"fish: store %s: sending command...", 1419}, + {"fish: Local read failed, sending zeros", 1420}, + {"fish: storing %s %d (%d)", 1421}, + {"zeros", 1422}, + {"Aborting transfer...", 1423}, + {"Error reported after abort.", 1424}, + {"Aborted transfer would be successful.", 1425}, + {"ftpfs: Disconnecting from %s", 1426}, + {" FTP: Password required for ", 1427}, + {" Proxy: Password required for ", 1428}, + {"ftpfs: sending proxy login name", 1429}, + {"ftpfs: sending proxy user password", 1430}, + {"ftpfs: proxy authentication succeeded", 1431}, + {"ftpfs: connected to %s", 1432}, + {"ftpfs: sending login name", 1433}, + {"ftpfs: sending user password", 1434}, + {"ftpfs: logged in", 1435}, + {"ftpfs: Login incorrect for user %s ", 1436}, + {" Could not set source routing (%s)", 1437}, + {"ftpfs: Invalid host name.", 1438}, + {"ftpfs: Invalid host address.", 1439}, + {"ftpfs: making connection to %s", 1440}, + {"ftpfs: connection interrupted by user", 1441}, + {"ftpfs: connection to server failed: %s", 1442}, + {"Waiting to retry... %d (Control-C to cancel)", 1443}, + {"ftpfs: could not setup passive mode", 1444}, + {"ftpfs: aborting transfer.", 1445}, + {"ftpfs: abort error: %s", 1446}, + {"ftpfs: abort failed", 1447}, + {"ftpfs: CWD failed.", 1448}, + {"ftpfs: couldn't resolve symlink", 1449}, + {"Resolving symlink...", 1450}, + {"ftpfs: Reading FTP directory %s... %s%s", 1451}, + {"(strict rfc959)", 1452}, + {"(chdir first)", 1453}, + {"ftpfs: failed", 1454}, + {"ftpfs: failed; nowhere to fallback to", 1455}, + {"ftpfs: storing file %d (%d)", 1456}, {"\ ~/.netrc file has not correct mode.\n\ -Remove password or correct mode.", 1453}, - {" MCFS ", 1454}, - {" The server does not support this version ", 1455}, +Remove password or correct mode.", 1457}, + {" MCFS ", 1458}, + {" The server does not support this version ", 1459}, {"\ The remote server is not running on a system port \n\ you need a password to log in, but the information may \n\ - not be safe on the remote side. Continue? \n", 1456}, - {" Yes ", 1457}, - {" No ", 1458}, - {" The remote server is running on strange port. Giving up.\n", 1459}, - {" MCFS Password required ", 1460}, - {" Invalid password ", 1461}, - {" Can't locate hostname: %s ", 1462}, - {" Can't create socket: %s ", 1463}, - {" Can't connect to server: %s ", 1464}, - {" Too many open connections ", 1465}, - {"Midnight Commander's private remote filesystem", 1466}, - {"Domain:", 1467}, - {"Username:", 1468}, - {"Password: ", 1469}, - {"Password for \\\\%s\\%s", 1470}, + not be safe on the remote side. Continue? \n", 1460}, + {" Yes ", 1461}, + {" No ", 1462}, + {" The remote server is running on strange port. Giving up.\n", 1463}, + {" MCFS Password required ", 1464}, + {" Invalid password ", 1465}, + {" Can't locate hostname: %s ", 1466}, + {" Can't create socket: %s ", 1467}, + {" Can't connect to server: %s ", 1468}, + {" Too many open connections ", 1469}, + {"Midnight Commander's private remote filesystem", 1470}, + {"Domain:", 1471}, + {"Username:", 1472}, + {"Password: ", 1473}, + {"Password for \\\\%s\\%s", 1474}, {"\ reconnect to %s failed\n\ - ", 1471}, - {" Authentication failed ", 1472}, - {" %s mkdir'ing %s ", 1473}, - {" %s rmdir'ing %s ", 1474}, - {" %s opening remote file %s ", 1475}, - {" %s renaming files\n", 1476}, + ", 1475}, + {" Authentication failed ", 1476}, + {" %s mkdir'ing %s ", 1477}, + {" %s rmdir'ing %s ", 1478}, + {" %s opening remote file %s ", 1479}, + {" %s renaming files\n", 1480}, {"\ Couldn't open tar archive\n\ -%s", 1477}, - {"Unexpected EOF on archive file", 1478}, - {"Inconsistent tar archive", 1479}, +%s", 1481}, + {"Unexpected EOF on archive file", 1482}, + {"Inconsistent tar archive", 1483}, {"\ Hmm,...\n\ %s\n\ -doesn't look like a tar archive.", 1480}, - {"Changes to file lost", 1481}, - {"Could not parse:", 1482}, - {"More parsing errors will be ignored.", 1483}, - {"(sorry)", 1484}, - {"Internal error:", 1485}, - {"%s: %s: %s %3d%% (%ld bytes transfered)", 1486}, - {"%s: %s: %s %ld bytes transfered", 1487}, - {" undelfs: error ", 1488}, - {" not enough memory ", 1489}, - {" while allocating block buffer ", 1490}, - {" open_inode_scan: %d ", 1491}, - {" while starting inode scan %d ", 1492}, - {"undelfs: loading deleted files information %d inodes", 1493}, - {" while calling ext2_block_iterate %d ", 1494}, - {" no more memory while reallocating array ", 1495}, - {" while doing inode scan %d ", 1496}, - {" Ext2lib error ", 1497}, - {" Could not open file %s ", 1498}, - {"undelfs: reading inode bitmap...", 1499}, +doesn't look like a tar archive.", 1484}, + {"Changes to file lost", 1485}, + {"Could not parse:", 1486}, + {"More parsing errors will be ignored.", 1487}, + {"(sorry)", 1488}, + {"Internal error:", 1489}, + {"%s: %s: %s %3d%% (%ld bytes transfered)", 1490}, + {"%s: %s: %s %ld bytes transfered", 1491}, + {" undelfs: error ", 1492}, + {" not enough memory ", 1493}, + {" while allocating block buffer ", 1494}, + {" open_inode_scan: %d ", 1495}, + {" while starting inode scan %d ", 1496}, + {"undelfs: loading deleted files information %d inodes", 1497}, + {" while calling ext2_block_iterate %d ", 1498}, + {" no more memory while reallocating array ", 1499}, + {" while doing inode scan %d ", 1500}, + {" Ext2lib error ", 1501}, + {" Could not open file %s ", 1502}, + {"undelfs: reading inode bitmap...", 1503}, {"\ Could not load inode bitmap from: \n\ - %s \n", 1500}, - {"undelfs: reading block bitmap...", 1501}, + %s \n", 1504}, + {"undelfs: reading block bitmap...", 1505}, {"\ Could not load block bitmap from: \n\ - %s \n", 1502}, - {"undelfs: done.", 1503}, - {"undelfs: failure", 1504}, - {" vfs_info is not fs! ", 1505}, - {" You have to chdir to extract files first ", 1506}, - {" while iterating over blocks ", 1507}, - {" Could not open file: %s ", 1508}, - {"Undelete filesystem for ext2", 1509}, + %s \n", 1506}, + {"undelfs: done.", 1507}, + {"undelfs: failure", 1508}, + {" vfs_info is not fs! ", 1509}, + {" You have to chdir to extract files first ", 1510}, + {" while iterating over blocks ", 1511}, + {" Could not open file: %s ", 1512}, + {"Undelete filesystem for ext2", 1513}, }; -int _msg_tbl_length = 1509; +int _msg_tbl_length = 1513; Binary files old/mc-4.5.49/po/cs.gmo and new/mc-4.5.50/po/cs.gmo differ Binary files old/mc-4.5.49/po/da.gmo and new/mc-4.5.50/po/da.gmo differ diff -ruN old/mc-4.5.49/po/da.po new/mc-4.5.50/po/da.po --- old/mc-4.5.49/po/da.po Wed May 24 14:30:50 2000 +++ new/mc-4.5.50/po/da.po Mon May 29 17:56:44 2000 @@ -12,11 +12,12 @@ #. Not essential to translate #: gtkedit/edit.c:2768 gtkedit/editcmd.c:2880 gtkedit/editcmd.c:2886 #: gtkedit/editcmd.c:2893 gtkedit/editcmd.c:2898 gtkedit/editcmd.c:2943 + msgid "" msgstr "" "Project-Id-Version: mc 4.5.41\n" "POT-Creation-Date: 2000-05-15 21:07+0200\n" -"PO-Revision-Date: 2000-05-07 17:37+01:00\n" +"PO-Revision-Date: 2000-05-27 23:37+01:00\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -480,11 +481,6 @@ msgid "Configure _Background Image" msgstr "Indstil _baggrundsbillede" -#. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop-init.c:141 -msgid "Home directory" -msgstr "Hjemmemappe" - #. Icon position #: gnome/gdesktop-prefs.c:242 msgid "Icon position" @@ -511,6 +507,11 @@ msgid "Desktop" msgstr "Skrivebord" +#. Create the link to the user's home directory so that he will have an icon +#: gnome/gdesktop-init.c:146 +msgid "Home directory" +msgstr "Hjemmemappe" + #: gnome/gdialogs.c:60 msgid "To: " msgstr "Til: " @@ -674,7 +675,7 @@ #. Translators should take care as "Password" or its translations #. are used to identify password boxes and hide characters with "*" -#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1833 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1820 msgid "Password:" msgstr "Adgangskode:" @@ -995,51 +996,6 @@ "Som root kan du gЬre skade pЕ dit system, hvis ud ikke passer pЕ.\n" "Gnome filhЕndteringen vil ikke forhindre dig i det." -#: gnome/gmc-client.c:26 -msgid "Could not contact the file manager\n" -msgstr "Kunne ikke kontakte filhЕndteringen\n" - -#: gnome/gmc-client.c:45 -msgid "Could not get the desktop\n" -msgstr "Kunne ikke fЕ skrivebordet\n" - -#: gnome/gmc-client.c:142 -#, c-format -msgid "Unknown arrange type `%s'\n" -msgstr "Ukendt sorteringstype `%s'\n" - -#: gnome/gmc-client.c:206 -msgid "Create window showing the specified directory" -msgstr "Opret vindue som viser den angivede mappe" - -#: gnome/gmc-client.c:206 gnome/gmc-client.c:208 -msgid "DIRECTORY" -msgstr "DIRECTORY" - -#: gnome/gmc-client.c:208 -msgid "Rescan the specified directory" -msgstr "GenindlФs den aktuelle mappe" - -#: gnome/gmc-client.c:210 -msgid "Rescan the desktop icons" -msgstr "GenindlФs skrivebordsikonerne" - -#: gnome/gmc-client.c:212 -msgid "Rescan the desktop device icons" -msgstr "GenindlФs skrivebordsenhedsikonerne" - -#: gnome/gmc-client.c:214 -msgid "Arrange the desktop icons" -msgstr "Ord skrivebordsikonerne" - -#: gnome/gmc-client.c:215 -msgid "name | type | size | atime | mtime | ctime" -msgstr "navn | type | stЬrrelse | atid | mtid | etid" - -#: gnome/gmc-client.c:217 -msgid "Close windows whose directories cannot be reached" -msgstr "Luk de vinduer hvis mapper ikke kan nЕes" - #: gnome/gmount.c:218 msgid "Could not open the /etc/fstab file" msgstr "Kunne ikke Еbne /etc/fstab filen" @@ -1722,6 +1678,51 @@ msgid "abort" msgstr "afbryd" +#: gnome/gmc-client.c:26 +msgid "Could not contact the file manager\n" +msgstr "Kunne ikke kontakte filhЕndteringen\n" + +#: gnome/gmc-client.c:45 +msgid "Could not get the desktop\n" +msgstr "Kunne ikke fЕ skrivebordet\n" + +#: gnome/gmc-client.c:142 +#, c-format +msgid "Unknown arrange type `%s'\n" +msgstr "Ukendt sorteringstype `%s'\n" + +#: gnome/gmc-client.c:206 +msgid "Create window showing the specified directory" +msgstr "Opret vindue som viser den angivede mappe" + +#: gnome/gmc-client.c:206 gnome/gmc-client.c:208 +msgid "DIRECTORY" +msgstr "DIRECTORY" + +#: gnome/gmc-client.c:208 +msgid "Rescan the specified directory" +msgstr "GenindlФs den aktuelle mappe" + +#: gnome/gmc-client.c:210 +msgid "Rescan the desktop icons" +msgstr "GenindlФs skrivebordsikonerne" + +#: gnome/gmc-client.c:212 +msgid "Rescan the desktop device icons" +msgstr "GenindlФs skrivebordsenhedsikonerne" + +#: gnome/gmc-client.c:214 +msgid "Arrange the desktop icons" +msgstr "Ord skrivebordsikonerne" + +#: gnome/gmc-client.c:215 +msgid "name | type | size | atime | mtime | ctime" +msgstr "navn | type | stЬrrelse | atid | mtid | etid" + +#: gnome/gmc-client.c:217 +msgid "Close windows whose directories cannot be reached" +msgstr "Luk de vinduer hvis mapper ikke kan nЕes" + #. The file-name is printed after the ':' #: gtkedit/edit.c:149 gtkedit/edit.c:318 gtkedit/edit.c:323 gtkedit/edit.c:337 #: gtkedit/edit.c:341 gtkedit/edit.c:373 gtkedit/edit.c:379 gtkedit/edit.c:386 @@ -3045,7 +3046,7 @@ " %s " #: src/achown.c:666 src/achown.c:670 src/chmod.c:320 src/chmod.c:324 -#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:669 +#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:671 msgid " Oops... " msgstr " Ups... " @@ -3598,15 +3599,15 @@ msgid " Could not chdir to %s " msgstr " Kunne ikke skifte mappe til %s " -#: src/cmd.c:1382 src/widget.c:1163 +#: src/cmd.c:1382 src/widget.c:1162 msgid " Link to a remote machine " msgstr " LФnke til en fremmed maskine " -#: src/cmd.c:1388 src/widget.c:1164 +#: src/cmd.c:1388 src/widget.c:1163 msgid " FTP to machine " msgstr " FTP til maskine " -#: src/cmd.c:1394 src/widget.c:1165 +#: src/cmd.c:1394 src/widget.c:1164 msgid " SMB link to machine " msgstr " SMB-lФnke til maskine " @@ -3741,7 +3742,7 @@ msgid "Unknown" msgstr "Ukendt" -#: src/ext.c:143 src/user.c:542 +#: src/ext.c:143 src/user.c:544 #, c-format msgid "" " Can't generate unique filename \n" @@ -3750,7 +3751,7 @@ " Kan ikke oprette unikt filnavn \n" " %s " -#: src/ext.c:150 src/user.c:554 +#: src/ext.c:150 src/user.c:556 #, c-format msgid "" " Can't create temporary command file \n" @@ -3759,7 +3760,7 @@ " Kan ikke oprette midlertidig kommandofil \n" " %s " -#: src/ext.c:165 src/user.c:576 +#: src/ext.c:165 src/user.c:578 msgid " Parameter " msgstr " Parameter " @@ -3767,23 +3768,37 @@ msgid " Can't execute commands on a Virtual File System directory " msgstr " Kan ikke kЬre kommandoer i en mappe pЕ et virtuelt filsystem " -#: src/ext.c:412 +#: src/ext.c:414 msgid " file error" msgstr " filfejl" -#: src/ext.c:413 +#: src/ext.c:415 msgid "Format of the " msgstr "Format af " -#: src/ext.c:431 +#: src/ext.c:417 +msgid "" +"mc.ext file has changed\n" +"with version 3.0. It seems that installation\n" +"failed. Please fetch a fresh new copy from the\n" +"Midnight Commander package or in case you don't\n" +"have any, get it from ftp://ftp.nuclecu.unam.mx." +msgstr "" +"mc.ext filen var Фndret\n" +"med version 3.0. Det ser ud til at installationen\n" +"fejlede. Venligst fЕ fat pЕ en frisk kopi fra\n" +"Midnight Commander pakken, eller ifald du ikke har nogen,\n" +"tag den fra ftp://ftp.nuclecu.unam.mx." + +#: src/ext.c:432 msgid " file error " msgstr " filfejl " -#: src/ext.c:432 +#: src/ext.c:433 msgid "Format of the ~/" msgstr "Format af ~/" -#: src/ext.c:432 +#: src/ext.c:433 msgid "" " file has changed\n" "with version 3.0. You may want either to\n" @@ -3793,7 +3808,7 @@ "siden version 3.0. Du kan enten \n" "kopiИre den fra " -#: src/ext.c:434 +#: src/ext.c:435 msgid "" "mc.ext or use that\n" "file as an example of how to write it.\n" @@ -3801,7 +3816,7 @@ "mc.ext eller bruge denne\n" "fil som et eksempel pЕ hvordan den skal laves.\n" -#: src/ext.c:436 +#: src/ext.c:437 msgid "mc.ext will be used for this moment." msgstr "mc.ext vil blive brugt indtil videre." @@ -4640,7 +4655,7 @@ msgid " Help " msgstr " HjФlp " -#: src/help.c:766 src/user.c:687 +#: src/help.c:766 src/user.c:689 #, c-format msgid "" " Can't open file %s \n" @@ -5388,7 +5403,7 @@ msgstr "" " Hvis du bruger hurtig genopfriskningsmetoden er det \n" " ikke sikkert at du fЕr korrekt besked om mappens \n" -" indhold. IsЕfald mЕ du bruge manuel genopfriskning. \n" +" indhold. I sЕ fald mЕ du bruge manuel genopfriskning. \n" " Tjek mansiden for detaljer. " #: src/main.c:1929 @@ -6021,32 +6036,44 @@ "Kan ikke skrive til %s filen::\n" "%s\n" -#: src/user.c:271 +#: src/user.c:137 +msgid " Format error on file Extensions File " +msgstr " Formatfejl pЕ fil-udvidelses fil " + +#: src/user.c:138 +msgid " The %%var macro does not have a default " +msgstr "%%var makroen har ikke en standardvФrdi " + +#: src/user.c:139 +msgid " The %%var macros does not have a variable " +msgstr "%%var makroen har ikke en variabel " + +#: src/user.c:273 #, c-format msgid " Invalid shell pattern definition \"%c\". " msgstr " Ugyldig mЬnsterdefinition for skal \"%c\". " -#: src/user.c:424 +#: src/user.c:426 msgid " Debug " msgstr " Aflus " -#: src/user.c:433 +#: src/user.c:435 msgid " ERROR: " msgstr " FEJL: " -#: src/user.c:437 +#: src/user.c:439 msgid " True: " msgstr " Sand: " -#: src/user.c:439 +#: src/user.c:441 msgid " False: " msgstr " Falsk: " -#: src/user.c:645 +#: src/user.c:647 msgid " Warning -- ignoring file " msgstr " Advarsel -- ignorerer filen " -#: src/user.c:646 +#: src/user.c:648 #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" @@ -6055,19 +6082,18 @@ "Filen %s er hverken ejet af root, dig eller globalt skrivbar.\n" "At bruge den kan muligvis kompromittere din sikkerhed" -#: src/user.c:670 +#: src/user.c:672 msgid " I can't run programs while logged on a non local directory " msgstr "" -" Jeg kan ikke kЬre programmer nЕr jeg er logget pЕ en ikke-lokal mappe " +" Jeg kan ikke kЬre programmer nЕr jeg er logget pЕ et ikke-lokalt katalog " -#. FIXME: this message is not quite right #: src/user.c:770 #, c-format -msgid " Empty file %s " -msgstr "TЬm fil %s" +msgid " No appropriative entries found in %s " +msgstr " Ingen passende indgange fundet i %s " #. Create listbox -#: src/user.c:779 +#: src/user.c:776 msgid " User menu " msgstr " Brugermenu " @@ -6272,7 +6298,7 @@ msgid "Format" msgstr "Format" -#: src/widget.c:995 +#: src/widget.c:994 msgid " History " msgstr " Historie " @@ -6646,141 +6672,141 @@ msgid "Aborted transfer would be successful." msgstr "Afbrudt overfЬrsel ville vФre lykkedes." -#: vfs/ftpfs.c:318 +#: vfs/ftpfs.c:315 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: Afkobler fra %s" -#: vfs/ftpfs.c:376 +#: vfs/ftpfs.c:373 msgid " FTP: Password required for " msgstr " FTP: BehЬver adgangskode til" -#: vfs/ftpfs.c:409 +#: vfs/ftpfs.c:402 msgid " Proxy: Password required for " msgstr " Proxy: BehЬver adgangskode til " -#: vfs/ftpfs.c:435 +#: vfs/ftpfs.c:428 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: sender proxy loginnavn" -#: vfs/ftpfs.c:439 +#: vfs/ftpfs.c:432 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: sender proxy brugeradgangskode" -#: vfs/ftpfs.c:443 +#: vfs/ftpfs.c:436 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: proxy bekrФftelse lykkedes" -#: vfs/ftpfs.c:447 +#: vfs/ftpfs.c:440 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: forbundet til %s" -#: vfs/ftpfs.c:464 +#: vfs/ftpfs.c:457 msgid "ftpfs: sending login name" msgstr "ftpfs: sender loginnavn" -#: vfs/ftpfs.c:469 +#: vfs/ftpfs.c:462 msgid "ftpfs: sending user password" msgstr "ftpfs: sender brugeradgangskode" -#: vfs/ftpfs.c:474 +#: vfs/ftpfs.c:467 msgid "ftpfs: logged in" msgstr "ftpfs: logget ind" -#: vfs/ftpfs.c:489 +#: vfs/ftpfs.c:482 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: Forkert login for bruger %s " -#: vfs/ftpfs.c:521 +#: vfs/ftpfs.c:514 #, c-format msgid " Could not set source routing (%s)" msgstr " Kunne ikke sФtte kilderuting op (%s)" -#: vfs/ftpfs.c:647 +#: vfs/ftpfs.c:640 msgid "ftpfs: Invalid host name." msgstr "ftpfs: Ugyldig vФrtsnavn." -#: vfs/ftpfs.c:667 +#: vfs/ftpfs.c:660 msgid "ftpfs: Invalid host address." msgstr "ftpfs: Ugyldig vФrtsadresse." -#: vfs/ftpfs.c:690 +#: vfs/ftpfs.c:683 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: laver forbindelse til %s" -#: vfs/ftpfs.c:700 +#: vfs/ftpfs.c:693 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: forbindelse afbrudt af bruger" -#: vfs/ftpfs.c:702 +#: vfs/ftpfs.c:695 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: forbindelse til server mislykkedes: %s" -#: vfs/ftpfs.c:744 +#: vfs/ftpfs.c:736 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "Venter pЕ at forsЬge igen... %d (Ctrl-C annullerer)" -#: vfs/ftpfs.c:930 +#: vfs/ftpfs.c:922 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: kunne ikke indstille passiv mЕde" -#: vfs/ftpfs.c:1005 +#: vfs/ftpfs.c:997 msgid "ftpfs: aborting transfer." msgstr "ftpfs: afbryder overfЬrsel." -#: vfs/ftpfs.c:1007 +#: vfs/ftpfs.c:999 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: afbrydelsesfejl: %s" -#: vfs/ftpfs.c:1012 +#: vfs/ftpfs.c:1004 msgid "ftpfs: abort failed" msgstr "ftpfs: afbryd mislykkedes" -#: vfs/ftpfs.c:1101 vfs/ftpfs.c:1200 +#: vfs/ftpfs.c:1093 vfs/ftpfs.c:1192 msgid "ftpfs: CWD failed." msgstr "ftpfs: CWD mislykkedes" -#: vfs/ftpfs.c:1111 vfs/ftpfs.c:1118 +#: vfs/ftpfs.c:1103 vfs/ftpfs.c:1110 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: kunne ikke lФse symlФnke" -#: vfs/ftpfs.c:1169 +#: vfs/ftpfs.c:1161 msgid "Resolving symlink..." msgstr "LФser symlФnke..." -#: vfs/ftpfs.c:1188 +#: vfs/ftpfs.c:1180 #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" msgstr "ftpfs: LФser FTP-mappe %s... %s%s" -#: vfs/ftpfs.c:1189 +#: vfs/ftpfs.c:1181 msgid "(strict rfc959)" msgstr "(fЬlg rfc959)" -#: vfs/ftpfs.c:1190 +#: vfs/ftpfs.c:1182 msgid "(chdir first)" msgstr "(chdir fЬrst)" -#: vfs/ftpfs.c:1287 +#: vfs/ftpfs.c:1279 msgid "ftpfs: failed" msgstr "ftpfs: fejlede" -#: vfs/ftpfs.c:1297 +#: vfs/ftpfs.c:1289 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: fejlede; ingen steder at falde tilbage pЕ" -#: vfs/ftpfs.c:1360 +#: vfs/ftpfs.c:1352 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: gemmer fil %d (%d)" -#: vfs/ftpfs.c:1775 +#: vfs/ftpfs.c:1767 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6913,11 +6939,11 @@ msgid "Unexpected EOF on archive file" msgstr "Uventet EOF i arkivfilen" -#: vfs/tar.c:339 vfs/tar.c:346 +#: vfs/tar.c:336 vfs/tar.c:343 msgid "Inconsistent tar archive" msgstr "Inkonsistent tar-arkiv" -#: vfs/tar.c:411 +#: vfs/tar.c:413 #, c-format msgid "" "Hmm,...\n" @@ -6928,6 +6954,35 @@ "%s\n" "ser ikke ud til at vФre et tar-arkiv." +#: vfs/vfs.c:1139 +msgid "Changes to file lost" +msgstr "фndringer til fil tabt" + +#: vfs/vfs.c:1781 +msgid "Could not parse:" +msgstr "Kunne ikke fortolke:" + +#: vfs/vfs.c:1783 +msgid "More parsing errors will be ignored." +msgstr "Flere fortolkningsfejl vil blive ignoreret." + +#: vfs/vfs.c:1783 +msgid "(sorry)" +msgstr "(beklager)" + +#: vfs/vfs.c:1794 +msgid "Internal error:" +msgstr " Intern fejl:" + +#: vfs/vfs.c:1804 +msgid "%s: %s: %s %3d%% (%ld bytes transfered)" +msgstr "%s: %s: %s %3d%% (%ld byte overfЬrt)" + +#: vfs/vfs.c:1805 +#, c-format +msgid "%s: %s: %s %ld bytes transfered" +msgstr "%s: %s: %s %ld byte overfЬrt" + #: vfs/undelfs.c:81 msgid " undelfs: error " msgstr " undelfs: fejl " @@ -7033,32 +7088,3 @@ #: vfs/undelfs.c:684 msgid "Undelete filesystem for ext2" msgstr "Undelete filsystem for ext2" - -#: vfs/vfs.c:1151 -msgid "Changes to file lost" -msgstr "фndringer til fil tabt" - -#: vfs/vfs.c:1794 -msgid "Could not parse:" -msgstr "Kunne ikke fortolke:" - -#: vfs/vfs.c:1796 -msgid "More parsing errors will be ignored." -msgstr "Flere fortolkningsfejl vil blive ignoreret." - -#: vfs/vfs.c:1796 -msgid "(sorry)" -msgstr "(beklager)" - -#: vfs/vfs.c:1807 -msgid "Internal error:" -msgstr " Intern fejl:" - -#: vfs/vfs.c:1817 -msgid "%s: %s: %s %3d%% (%ld bytes transfered)" -msgstr "%s: %s: %s %3d%% (%ld byte overfЬrt)" - -#: vfs/vfs.c:1818 -#, c-format -msgid "%s: %s: %s %ld bytes transfered" -msgstr "%s: %s: %s %ld byte overfЬrt" Binary files old/mc-4.5.49/po/de.gmo and new/mc-4.5.50/po/de.gmo differ Binary files old/mc-4.5.49/po/el.gmo and new/mc-4.5.50/po/el.gmo differ Binary files old/mc-4.5.49/po/es.gmo and new/mc-4.5.50/po/es.gmo differ Binary files old/mc-4.5.49/po/es_ES.gmo and new/mc-4.5.50/po/es_ES.gmo differ Binary files old/mc-4.5.49/po/fi.gmo and new/mc-4.5.50/po/fi.gmo differ Binary files old/mc-4.5.49/po/fr.gmo and new/mc-4.5.50/po/fr.gmo differ Binary files old/mc-4.5.49/po/hu.gmo and new/mc-4.5.50/po/hu.gmo differ Binary files old/mc-4.5.49/po/it.gmo and new/mc-4.5.50/po/it.gmo differ Binary files old/mc-4.5.49/po/ja.gmo and new/mc-4.5.50/po/ja.gmo differ Binary files old/mc-4.5.49/po/ko.gmo and new/mc-4.5.50/po/ko.gmo differ diff -ruN old/mc-4.5.49/po/mc.pot new/mc-4.5.50/po/mc.pot --- old/mc-4.5.49/po/mc.pot Wed May 24 14:30:50 2000 +++ new/mc-4.5.50/po/mc.pot Mon May 29 17:56:44 2000 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-05-24 14:30-0400\n" +"POT-Creation-Date: 2000-05-29 17:32-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -632,7 +632,7 @@ #. Translators should take care as "Password" or its translations #. are used to identify password boxes and hide characters with "*" -#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1823 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1820 msgid "Password:" msgstr "" @@ -2943,7 +2943,7 @@ msgstr "" #: src/achown.c:666 src/achown.c:670 src/chmod.c:320 src/chmod.c:324 -#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:669 +#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:671 msgid " Oops... " msgstr "" @@ -3489,15 +3489,15 @@ msgid " Could not chdir to %s " msgstr "" -#: src/cmd.c:1382 src/widget.c:1163 +#: src/cmd.c:1382 src/widget.c:1162 msgid " Link to a remote machine " msgstr "" -#: src/cmd.c:1388 src/widget.c:1164 +#: src/cmd.c:1388 src/widget.c:1163 msgid " FTP to machine " msgstr "" -#: src/cmd.c:1394 src/widget.c:1165 +#: src/cmd.c:1394 src/widget.c:1164 msgid " SMB link to machine " msgstr "" @@ -3622,21 +3622,21 @@ msgid "Unknown" msgstr "" -#: src/ext.c:143 src/user.c:542 +#: src/ext.c:143 src/user.c:544 #, c-format msgid "" " Can't generate unique filename \n" " %s " msgstr "" -#: src/ext.c:150 src/user.c:554 +#: src/ext.c:150 src/user.c:556 #, c-format msgid "" " Can't create temporary command file \n" " %s " msgstr "" -#: src/ext.c:165 src/user.c:576 +#: src/ext.c:165 src/user.c:578 msgid " Parameter " msgstr "" @@ -3644,36 +3644,45 @@ msgid " Can't execute commands on a Virtual File System directory " msgstr "" -#: src/ext.c:412 +#: src/ext.c:414 msgid " file error" msgstr "" -#: src/ext.c:413 +#: src/ext.c:415 msgid "Format of the " msgstr "" -#: src/ext.c:431 -msgid " file error " +#: src/ext.c:417 +msgid "" +"mc.ext file has changed\n" +"with version 3.0. It seems that installation\n" +"failed. Please fetch a fresh new copy from the\n" +"Midnight Commander package or in case you don't\n" +"have any, get it from ftp://ftp.nuclecu.unam.mx." msgstr "" #: src/ext.c:432 +msgid " file error " +msgstr "" + +#: src/ext.c:433 msgid "Format of the ~/" msgstr "" -#: src/ext.c:432 +#: src/ext.c:433 msgid "" " file has changed\n" "with version 3.0. You may want either to\n" "copy it from " msgstr "" -#: src/ext.c:434 +#: src/ext.c:435 msgid "" "mc.ext or use that\n" "file as an example of how to write it.\n" msgstr "" -#: src/ext.c:436 +#: src/ext.c:437 msgid "mc.ext will be used for this moment." msgstr "" @@ -4442,7 +4451,7 @@ msgid " Help " msgstr "" -#: src/help.c:766 src/user.c:687 +#: src/help.c:766 src/user.c:689 #, c-format msgid "" " Can't open file %s \n" @@ -5729,50 +5738,61 @@ "%s\n" msgstr "" -#: src/user.c:271 +#: src/user.c:137 +msgid " Format error on file Extensions File " +msgstr "" + +#: src/user.c:138 +msgid " The %%var macro does not have a default " +msgstr "" + +#: src/user.c:139 +msgid " The %%var macros does not have a variable " +msgstr "" + +#: src/user.c:273 #, c-format msgid " Invalid shell pattern definition \"%c\". " msgstr "" -#: src/user.c:424 +#: src/user.c:426 msgid " Debug " msgstr "" -#: src/user.c:433 +#: src/user.c:435 msgid " ERROR: " msgstr "" -#: src/user.c:437 +#: src/user.c:439 msgid " True: " msgstr "" -#: src/user.c:439 +#: src/user.c:441 msgid " False: " msgstr "" -#: src/user.c:645 +#: src/user.c:647 msgid " Warning -- ignoring file " msgstr "" -#: src/user.c:646 +#: src/user.c:648 #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" "Using it may compromise your security" msgstr "" -#: src/user.c:670 +#: src/user.c:672 msgid " I can't run programs while logged on a non local directory " msgstr "" -#. FIXME: this message is not quite right #: src/user.c:770 #, c-format -msgid " Empty file %s " +msgid " No appropriative entries found in %s " msgstr "" #. Create listbox -#: src/user.c:779 +#: src/user.c:776 msgid " User menu " msgstr "" @@ -5961,7 +5981,7 @@ msgid "Format" msgstr "" -#: src/widget.c:995 +#: src/widget.c:994 msgid " History " msgstr "" @@ -6592,31 +6612,31 @@ "doesn't look like a tar archive." msgstr "" -#: vfs/vfs.c:1141 +#: vfs/vfs.c:1139 msgid "Changes to file lost" msgstr "" -#: vfs/vfs.c:1784 +#: vfs/vfs.c:1781 msgid "Could not parse:" msgstr "" -#: vfs/vfs.c:1786 +#: vfs/vfs.c:1783 msgid "More parsing errors will be ignored." msgstr "" -#: vfs/vfs.c:1786 +#: vfs/vfs.c:1783 msgid "(sorry)" msgstr "" -#: vfs/vfs.c:1797 +#: vfs/vfs.c:1794 msgid "Internal error:" msgstr "" -#: vfs/vfs.c:1807 +#: vfs/vfs.c:1804 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "" -#: vfs/vfs.c:1808 +#: vfs/vfs.c:1805 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "" Binary files old/mc-4.5.49/po/nl.gmo and new/mc-4.5.50/po/nl.gmo differ Binary files old/mc-4.5.49/po/no.gmo and new/mc-4.5.50/po/no.gmo differ diff -ruN old/mc-4.5.49/po/no.po new/mc-4.5.50/po/no.po --- old/mc-4.5.49/po/no.po Wed May 24 14:30:50 2000 +++ new/mc-4.5.50/po/no.po Mon May 29 17:56:44 2000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.34\n" -"POT-Creation-Date: 2000-05-16 11:14+0200\n" -"PO-Revision-Date: 2000-05-16 11:14+02:00\n" +"POT-Creation-Date: 2000-05-28 12:31+0200\n" +"PO-Revision-Date: 2000-05-28 12:33+02:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" "MIME-Version: 1.0\n" @@ -497,7 +497,7 @@ msgstr "Skrivebord" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop-init.c:141 +#: gnome/gdesktop-init.c:146 msgid "Home directory" msgstr "Hjemmekatalog" @@ -664,7 +664,7 @@ #. Translators should take care as "Password" or its translations #. are used to identify password boxes and hide characters with "*" -#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1833 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1820 msgid "Password:" msgstr "Passord:" @@ -3034,7 +3034,7 @@ " %s " #: src/achown.c:666 src/achown.c:670 src/chmod.c:320 src/chmod.c:324 -#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:669 +#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:671 msgid " Oops... " msgstr " Oops... " @@ -3588,15 +3588,15 @@ msgid " Could not chdir to %s " msgstr " Kunne ikke skifte katalog til %s " -#: src/cmd.c:1382 src/widget.c:1163 +#: src/cmd.c:1382 src/widget.c:1162 msgid " Link to a remote machine " msgstr " Lenke til en fjern maskin " -#: src/cmd.c:1388 src/widget.c:1164 +#: src/cmd.c:1388 src/widget.c:1163 msgid " FTP to machine " msgstr " FTP til maskin " -#: src/cmd.c:1394 src/widget.c:1165 +#: src/cmd.c:1394 src/widget.c:1164 msgid " SMB link to machine " msgstr " SMB-tilkobling til maskin " @@ -3731,7 +3731,7 @@ msgid "Unknown" msgstr "Ukjent" -#: src/ext.c:143 src/user.c:542 +#: src/ext.c:143 src/user.c:544 #, c-format msgid "" " Can't generate unique filename \n" @@ -3740,7 +3740,7 @@ " Kan ikke generere et unikt filnavn \n" " %s " -#: src/ext.c:150 src/user.c:554 +#: src/ext.c:150 src/user.c:556 #, c-format msgid "" " Can't create temporary command file \n" @@ -3749,7 +3749,7 @@ "Kan ikke opprette midlertidig kommandofil \n" " %s " -#: src/ext.c:165 src/user.c:576 +#: src/ext.c:165 src/user.c:578 msgid " Parameter " msgstr " Parameter " @@ -3757,23 +3757,37 @@ msgid " Can't execute commands on a Virtual File System directory " msgstr " Kan ikke kjЬre kommandoer i en katalog pЕ et virtuelt filsystem " -#: src/ext.c:412 +#: src/ext.c:414 msgid " file error" msgstr " filfeil" -#: src/ext.c:413 +#: src/ext.c:415 msgid "Format of the " msgstr "Formatet til " -#: src/ext.c:431 +#: src/ext.c:417 +msgid "" +"mc.ext file has changed\n" +"with version 3.0. It seems that installation\n" +"failed. Please fetch a fresh new copy from the\n" +"Midnight Commander package or in case you don't\n" +"have any, get it from ftp://ftp.nuclecu.unam.mx." +msgstr "" +"mc.ext filen er endret\n" +"i versjon 3.0. Det ser ut til at installasjonen\n" +"feilet. Vennligst hent en ny kopi fra Midnight\n" +"Commander pakken, eller hvis du ikke har denne,\n" +"hent den fra ftp://ftp.nuclecu.unam.mx." + +#: src/ext.c:432 msgid " file error " msgstr " filfeil " -#: src/ext.c:432 +#: src/ext.c:433 msgid "Format of the ~/" msgstr "Formatet til ~/" -#: src/ext.c:432 +#: src/ext.c:433 msgid "" " file has changed\n" "with version 3.0. You may want either to\n" @@ -3783,7 +3797,7 @@ "siden versjon 3.0. Du kan enten \n" "kopiere den fra " -#: src/ext.c:434 +#: src/ext.c:435 msgid "" "mc.ext or use that\n" "file as an example of how to write it.\n" @@ -3791,7 +3805,7 @@ "mc.ext eller bruke denne\n" "filen som et eksempel for hvordan den skal skrives.\n" -#: src/ext.c:436 +#: src/ext.c:437 msgid "mc.ext will be used for this moment." msgstr "mc.ext vil bli brukt forelЬpig." @@ -4630,7 +4644,7 @@ msgid " Help " msgstr " Hjelp " -#: src/help.c:766 src/user.c:687 +#: src/help.c:766 src/user.c:689 #, c-format msgid "" " Can't open file %s \n" @@ -6013,32 +6027,44 @@ "Kan ikke skrive til %s filen:\n" "%s\n" -#: src/user.c:271 +#: src/user.c:137 +msgid " Format error on file Extensions File " +msgstr " Formatfeil pЕ filtypefilen " + +#: src/user.c:138 +msgid " The %%var macro does not have a default " +msgstr " %%var makroen har ikke en standardverdi " + +#: src/user.c:139 +msgid " The %%var macros does not have a variable " +msgstr " %%var makroen har ingen variabel " + +#: src/user.c:273 #, c-format msgid " Invalid shell pattern definition \"%c\". " msgstr " Ugyldig mЬnsterdefinisjon for skall \"%c\". " -#: src/user.c:424 +#: src/user.c:426 msgid " Debug " msgstr " Avlus " -#: src/user.c:433 +#: src/user.c:435 msgid " ERROR: " msgstr " FEIL: " -#: src/user.c:437 +#: src/user.c:439 msgid " True: " msgstr " Sann: " -#: src/user.c:439 +#: src/user.c:441 msgid " False: " msgstr " Usann: " -#: src/user.c:645 +#: src/user.c:647 msgid " Warning -- ignoring file " msgstr " Advarsel -- ignorerer filen " -#: src/user.c:646 +#: src/user.c:648 #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" @@ -6047,19 +6073,18 @@ "Filen %s er ikke eid av root eller er skrivbar for alle.\n" "Bruk av den kan kompromittere sikkerheten" -#: src/user.c:670 +#: src/user.c:672 msgid " I can't run programs while logged on a non local directory " msgstr "" " Jeg kan ikke kjЬre programmer nЕr jeg er logget pЕ en ekstern katalog " -#. FIXME: this message is not quite right #: src/user.c:770 #, c-format -msgid " Empty file %s " -msgstr " Tom fil %s " +msgid " No appropriative entries found in %s " +msgstr " Ingen passende oppfЬringer funnet i %s " #. Create listbox -#: src/user.c:779 +#: src/user.c:776 msgid " User menu " msgstr " Brukermeny " @@ -6264,7 +6289,7 @@ msgid "Format" msgstr "Format" -#: src/widget.c:995 +#: src/widget.c:994 msgid " History " msgstr " Historikk " @@ -6639,141 +6664,141 @@ msgid "Aborted transfer would be successful." msgstr "Avbrutt overfЬring ville vФrt i orden." -#: vfs/ftpfs.c:318 +#: vfs/ftpfs.c:315 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: Kobler fra %s" -#: vfs/ftpfs.c:376 +#: vfs/ftpfs.c:373 msgid " FTP: Password required for " msgstr " FTP: Passord nЬdvendig for " -#: vfs/ftpfs.c:409 +#: vfs/ftpfs.c:402 msgid " Proxy: Password required for " msgstr " Proxy: Passord nЬdvendig for " -#: vfs/ftpfs.c:435 +#: vfs/ftpfs.c:428 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: sender innloggingsnavn for proxy" -#: vfs/ftpfs.c:439 +#: vfs/ftpfs.c:432 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: sender brukers passord til proxy" -#: vfs/ftpfs.c:443 +#: vfs/ftpfs.c:436 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: autentisering mot proxy i orden" -#: vfs/ftpfs.c:447 +#: vfs/ftpfs.c:440 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: tilkoblet til %s" -#: vfs/ftpfs.c:464 +#: vfs/ftpfs.c:457 msgid "ftpfs: sending login name" msgstr "ftpfs: sender innloggingsnavn" -#: vfs/ftpfs.c:469 +#: vfs/ftpfs.c:462 msgid "ftpfs: sending user password" msgstr "ftpfs: sender brukers passord" -#: vfs/ftpfs.c:474 +#: vfs/ftpfs.c:467 msgid "ftpfs: logged in" msgstr "ftpfs: logget inn" -#: vfs/ftpfs.c:489 +#: vfs/ftpfs.c:482 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: Innlogging ukorrekt for bruker %s " -#: vfs/ftpfs.c:521 +#: vfs/ftpfs.c:514 #, c-format msgid " Could not set source routing (%s)" msgstr " Kunne ikke sette opp kilderuting (%s)" -#: vfs/ftpfs.c:647 +#: vfs/ftpfs.c:640 msgid "ftpfs: Invalid host name." msgstr "ftpfs: Ugyldig vertsnavn." -#: vfs/ftpfs.c:667 +#: vfs/ftpfs.c:660 msgid "ftpfs: Invalid host address." msgstr "ftpfs: Ugyldig vertsadresse." -#: vfs/ftpfs.c:690 +#: vfs/ftpfs.c:683 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: setter opp forbindelse til %s" -#: vfs/ftpfs.c:700 +#: vfs/ftpfs.c:693 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: tilkobling avbrutt av bruker" -#: vfs/ftpfs.c:702 +#: vfs/ftpfs.c:695 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: tilkobling til tjener feilet: %s" -#: vfs/ftpfs.c:744 +#: vfs/ftpfs.c:736 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "Venter pЕ nytt forsЬk... %d (Ctrl-C for Е avbryte)" -#: vfs/ftpfs.c:930 +#: vfs/ftpfs.c:922 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: kunne ikke sette opp passiv modus" -#: vfs/ftpfs.c:1005 +#: vfs/ftpfs.c:997 msgid "ftpfs: aborting transfer." msgstr "ftpfs: avbryter overfЬring." -#: vfs/ftpfs.c:1007 +#: vfs/ftpfs.c:999 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: avbrytlsesfeil: %s" -#: vfs/ftpfs.c:1012 +#: vfs/ftpfs.c:1004 msgid "ftpfs: abort failed" msgstr "ftpfs: avbrudd feilet" -#: vfs/ftpfs.c:1101 vfs/ftpfs.c:1200 +#: vfs/ftpfs.c:1093 vfs/ftpfs.c:1192 msgid "ftpfs: CWD failed." msgstr "ftpfs: CWD feilet." -#: vfs/ftpfs.c:1111 vfs/ftpfs.c:1118 +#: vfs/ftpfs.c:1103 vfs/ftpfs.c:1110 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: kunne ikke fЬlge symbolsk lenke" -#: vfs/ftpfs.c:1169 +#: vfs/ftpfs.c:1161 msgid "Resolving symlink..." msgstr "Finner symlink..." -#: vfs/ftpfs.c:1188 +#: vfs/ftpfs.c:1180 #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" msgstr "ftpfs: Leser FTP katalog %s... %s%s" -#: vfs/ftpfs.c:1189 +#: vfs/ftpfs.c:1181 msgid "(strict rfc959)" msgstr "(fЬlg rfc959)" -#: vfs/ftpfs.c:1190 +#: vfs/ftpfs.c:1182 msgid "(chdir first)" msgstr "(chdir fЬrst)" -#: vfs/ftpfs.c:1287 +#: vfs/ftpfs.c:1279 msgid "ftpfs: failed" msgstr "ftpfs: feilet" -#: vfs/ftpfs.c:1297 +#: vfs/ftpfs.c:1289 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: feilet; ingen steder Е falle tilbake til" -#: vfs/ftpfs.c:1360 +#: vfs/ftpfs.c:1352 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: lagrer fil %d (%d)" -#: vfs/ftpfs.c:1775 +#: vfs/ftpfs.c:1767 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6906,11 +6931,11 @@ msgid "Unexpected EOF on archive file" msgstr "Uventet EOF i arkivfilen" -#: vfs/tar.c:339 vfs/tar.c:346 +#: vfs/tar.c:336 vfs/tar.c:343 msgid "Inconsistent tar archive" msgstr "Ukonsistent tar-arkiv" -#: vfs/tar.c:411 +#: vfs/tar.c:413 #, c-format msgid "" "Hmm,...\n" @@ -6921,31 +6946,31 @@ "%s\n" "ser ikke ut som et tar-arkiv." -#: vfs/vfs.c:1151 +#: vfs/vfs.c:1139 msgid "Changes to file lost" msgstr "Endringer i filen tapt" -#: vfs/vfs.c:1794 +#: vfs/vfs.c:1781 msgid "Could not parse:" msgstr "Kunne ikke fortolke:" -#: vfs/vfs.c:1796 +#: vfs/vfs.c:1783 msgid "More parsing errors will be ignored." msgstr "Flere fortolkningsfeil vil bli ignorert." -#: vfs/vfs.c:1796 +#: vfs/vfs.c:1783 msgid "(sorry)" msgstr "(beklager)" -#: vfs/vfs.c:1807 +#: vfs/vfs.c:1794 msgid "Internal error:" msgstr "Intern feil:" -#: vfs/vfs.c:1817 +#: vfs/vfs.c:1804 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "%s: %s: %s %3d%% (%ld bytes overfЬrt)" -#: vfs/vfs.c:1818 +#: vfs/vfs.c:1805 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld bytes overfЬrt" Binary files old/mc-4.5.49/po/pl.gmo and new/mc-4.5.50/po/pl.gmo differ Binary files old/mc-4.5.49/po/pt_BR.gmo and new/mc-4.5.50/po/pt_BR.gmo differ Binary files old/mc-4.5.49/po/ro.gmo and new/mc-4.5.50/po/ro.gmo differ Binary files old/mc-4.5.49/po/ru.gmo and new/mc-4.5.50/po/ru.gmo differ diff -ruN old/mc-4.5.49/po/ru.po new/mc-4.5.50/po/ru.po --- old/mc-4.5.49/po/ru.po Wed May 24 14:30:50 2000 +++ new/mc-4.5.50/po/ru.po Mon May 29 17:56:44 2000 @@ -6,7 +6,7 @@ # Andrew V. Samoilov , 1999, # and Alex Tkachenko , 1998. # -# $Id: ru.po,v 1.30 2000/05/19 15:01:45 frob Exp $ +# $Id: ru.po,v 1.31 2000/05/26 16:11:52 frob Exp $ # #. Not essential to translate #: gtkedit/edit.c:2768 gtkedit/editcmd.c:2880 gtkedit/editcmd.c:2886 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.46\n" -"POT-Creation-Date: 2000-05-15 23:10+0000\n" -"PO-Revision-Date: 2000-05-19 19:06+00:00\n" +"POT-Creation-Date: 2000-05-26 20:00+0000\n" +"PO-Revision-Date: 2000-05-26 20:05+00:00\n" "Last-Translator: Andrew V. Samoilov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -507,7 +507,7 @@ msgstr "Рабочий стол" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop-init.c:141 +#: gnome/gdesktop-init.c:146 msgid "Home directory" msgstr "Персональный каталог" @@ -674,7 +674,7 @@ #. Translators should take care as "Password" or its translations #. are used to identify password boxes and hide characters with "*" -#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1833 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1820 msgid "Password:" msgstr "Пароль:" @@ -3044,7 +3044,7 @@ " %s " #: src/achown.c:666 src/achown.c:670 src/chmod.c:320 src/chmod.c:324 -#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:669 +#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:671 msgid " Oops... " msgstr " Ой... " @@ -3596,15 +3596,15 @@ msgid " Could not chdir to %s " msgstr " Невозможно перейти в %s " -#: src/cmd.c:1382 src/widget.c:1163 +#: src/cmd.c:1382 src/widget.c:1162 msgid " Link to a remote machine " msgstr " Соединение с удаленной машиной " -#: src/cmd.c:1388 src/widget.c:1164 +#: src/cmd.c:1388 src/widget.c:1163 msgid " FTP to machine " msgstr " FTP-соединение с удаленной машиной " -#: src/cmd.c:1394 src/widget.c:1165 +#: src/cmd.c:1394 src/widget.c:1164 msgid " SMB link to machine " msgstr " SMB связь с машиной " @@ -3739,7 +3739,7 @@ msgid "Unknown" msgstr "Неизвестный" -#: src/ext.c:143 src/user.c:542 +#: src/ext.c:143 src/user.c:544 #, c-format msgid "" " Can't generate unique filename \n" @@ -3748,7 +3748,7 @@ " Невозможно сформировать уникальное имя файла \n" " %s " -#: src/ext.c:150 src/user.c:554 +#: src/ext.c:150 src/user.c:556 #, c-format msgid "" " Can't create temporary command file \n" @@ -3757,7 +3757,7 @@ " Невозможно создать временный командный файл \n" " %s " -#: src/ext.c:165 src/user.c:576 +#: src/ext.c:165 src/user.c:578 msgid " Parameter " msgstr " Параметр " @@ -3765,23 +3765,37 @@ msgid " Can't execute commands on a Virtual File System directory " msgstr " Невозможно выполнить команду в каталоге Виртуальной Файловой Системы" -#: src/ext.c:412 +#: src/ext.c:414 msgid " file error" msgstr " ошибка файла" -#: src/ext.c:413 +#: src/ext.c:415 msgid "Format of the " msgstr "Формат " -#: src/ext.c:431 +#: src/ext.c:417 +msgid "" +"mc.ext file has changed\n" +"with version 3.0. It seems that installation\n" +"failed. Please fetch a fresh new copy from the\n" +"Midnight Commander package or in case you don't\n" +"have any, get it from ftp://ftp.nuclecu.unam.mx." +msgstr "" +"mc.ext файл изменен\n" +"с версии 3.0. Возможно произошел сбой при установке.\n" +"Пожалуйста возьмите свежую копию из пакета\n" +"Midnight Commander или если у вас его нет, то\n" +"с сервера ftp://ftp.nuclecu.unam.mx." + +#: src/ext.c:432 msgid " file error " msgstr " ошибка файла " -#: src/ext.c:432 +#: src/ext.c:433 msgid "Format of the ~/" msgstr "Формат ~/" -#: src/ext.c:432 +#: src/ext.c:433 msgid "" " file has changed\n" "with version 3.0. You may want either to\n" @@ -3791,7 +3805,7 @@ "в версии 3.0. Вы можете или\n" "скопировать его из " -#: src/ext.c:434 +#: src/ext.c:435 msgid "" "mc.ext or use that\n" "file as an example of how to write it.\n" @@ -3799,7 +3813,7 @@ "mc.ext или использовать этот\n" "файл как пример написания.\n" -#: src/ext.c:436 +#: src/ext.c:437 msgid "mc.ext will be used for this moment." msgstr "mc.ext будет использован в настоящий момент." @@ -4639,7 +4653,7 @@ msgid " Help " msgstr " Помощь " -#: src/help.c:766 src/user.c:687 +#: src/help.c:766 src/user.c:689 #, c-format msgid "" " Can't open file %s \n" @@ -5465,8 +5479,7 @@ #: src/main.c:2518 msgid "-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n" msgstr "" -"-M, --memory файл [ТОЛЬКО для РАЗРАБОТЧИКОВ: Запись сообщений MAD в " -"файл.]\n" +"-M, --memory файл [ТОЛЬКО для РАЗРАБОТЧИКОВ: Запись сообщений MAD в файл.]\n" #: src/main.c:2520 msgid "" @@ -5484,7 +5497,7 @@ #: src/main.c:2526 msgid "" "-S, --createcmdile Create command file to set default directory upon exit.\n" -msgstr "" +msgstr "-S, --createcmdile Создать командный файл для установки каталога по умолчанию после выхода.\n" #: src/main.c:2529 msgid "" @@ -5502,7 +5515,8 @@ msgstr "" "-v, --view fname Запуск в режиме просмотра файла.\n" "\"-V, --version Сообщить версию и параметры настройки.\n" -"\"-x, --xterm Поддержка мыши в xterm и сохранения/восстановления экрана.\n" +"\"-x, --xterm Поддержка мыши в xterm и сохранения/восстановления " +"экрана.\n" "+число число - номер начальной строки для редактора.\n" #: src/main.c:2538 @@ -6000,32 +6014,44 @@ "Невозможно писать в файл %s:\n" "%s\n" -#: src/user.c:271 +#: src/user.c:137 +msgid " Format error on file Extensions File " +msgstr " Ошибка формата в файле Расширений файлов" + +#: src/user.c:138 +msgid " The %%var macro does not have a default " +msgstr " Максрос %%var не имеет значений по умолчанию" + +#: src/user.c:139 +msgid " The %%var macros does not have a variable " +msgstr " Макрос %%var не имеет переменных" + +#: src/user.c:273 #, c-format msgid " Invalid shell pattern definition \"%c\". " msgstr " Неверное определение образца оболочки \"%c\". " -#: src/user.c:424 +#: src/user.c:426 msgid " Debug " msgstr " Отладка " -#: src/user.c:433 +#: src/user.c:435 msgid " ERROR: " msgstr " ОШИБКА: " -#: src/user.c:437 +#: src/user.c:439 msgid " True: " msgstr " Истина: " -#: src/user.c:439 +#: src/user.c:441 msgid " False: " msgstr " Ложь: " -#: src/user.c:645 +#: src/user.c:647 msgid " Warning -- ignoring file " msgstr " Предупреждение - файл игнорируется " -#: src/user.c:646 +#: src/user.c:648 #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" @@ -6035,18 +6061,17 @@ "и доступен другим на запись. Использование такого файла неприемлемо\n" "c точки зрения безопасности." -#: src/user.c:670 +#: src/user.c:672 msgid " I can't run programs while logged on a non local directory " msgstr " Невозможно исполнять программы, будучи не в локальном каталоге " -#. FIXME: this message is not quite right #: src/user.c:770 #, c-format -msgid " Empty file %s " -msgstr " Пустой файл %s " +msgid " No appropriative entries found in %s " +msgstr " Не найдено подходящих записей в %s" #. Create listbox -#: src/user.c:779 +#: src/user.c:776 msgid " User menu " msgstr " Меню пользователя " @@ -6251,7 +6276,7 @@ msgid "Format" msgstr "Формат" -#: src/widget.c:995 +#: src/widget.c:994 msgid " History " msgstr "История команд" @@ -6559,8 +6584,7 @@ #: vfs/fish.c:228 msgid "Sorry, we can not do password authenticated connections for now." -msgstr "" -"Извините, невозможно создать авторизованные паролем соединения сейчас." +msgstr "Извините, невозможно создать авторизованные паролем соединения сейчас." #: vfs/fish.c:233 msgid " fish: Password required for " @@ -6627,141 +6651,141 @@ msgid "Aborted transfer would be successful." msgstr "Передача успешно прервана." -#: vfs/ftpfs.c:318 +#: vfs/ftpfs.c:315 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: Отсоединение от %s" -#: vfs/ftpfs.c:376 +#: vfs/ftpfs.c:373 msgid " FTP: Password required for " msgstr " FTP: Требуется пароль для " -#: vfs/ftpfs.c:409 +#: vfs/ftpfs.c:402 msgid " Proxy: Password required for " msgstr " Прокси: Требуется пароль для " -#: vfs/ftpfs.c:435 +#: vfs/ftpfs.c:428 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: Посылается имя пользователя прокси" -#: vfs/ftpfs.c:439 +#: vfs/ftpfs.c:432 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: Посылается пароль пользователя прокси" -#: vfs/ftpfs.c:443 +#: vfs/ftpfs.c:436 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: Авторизация на прокси успешна" -#: vfs/ftpfs.c:447 +#: vfs/ftpfs.c:440 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: Подключен к %s" -#: vfs/ftpfs.c:464 +#: vfs/ftpfs.c:457 msgid "ftpfs: sending login name" msgstr "ftpfs: Посылается имя пользователя" -#: vfs/ftpfs.c:469 +#: vfs/ftpfs.c:462 msgid "ftpfs: sending user password" msgstr "ftpfs: Посылается пароль пользователя" -#: vfs/ftpfs.c:474 +#: vfs/ftpfs.c:467 msgid "ftpfs: logged in" msgstr "ftpfs: зарегистрирован" -#: vfs/ftpfs.c:489 +#: vfs/ftpfs.c:482 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: Ошибка регистрации пользователя %s " -#: vfs/ftpfs.c:521 +#: vfs/ftpfs.c:514 #, c-format msgid " Could not set source routing (%s)" msgstr "Невозможно установить распределение источника (%s)" -#: vfs/ftpfs.c:647 +#: vfs/ftpfs.c:640 msgid "ftpfs: Invalid host name." msgstr "ftpfs: Неверное имя системы." -#: vfs/ftpfs.c:667 +#: vfs/ftpfs.c:660 msgid "ftpfs: Invalid host address." msgstr "ftpfs: Неверный адрес системы." -#: vfs/ftpfs.c:690 +#: vfs/ftpfs.c:683 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: осуществляется соединение с %s" -#: vfs/ftpfs.c:700 +#: vfs/ftpfs.c:693 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: соединение прервано пользователем" -#: vfs/ftpfs.c:702 +#: vfs/ftpfs.c:695 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: сбой соединения с сервером: %s" -#: vfs/ftpfs.c:744 +#: vfs/ftpfs.c:736 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "Ожидание повтора попытки... %d (Control-C для отмены)" -#: vfs/ftpfs.c:930 +#: vfs/ftpfs.c:922 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: невозможно установить пассивный режим" -#: vfs/ftpfs.c:1005 +#: vfs/ftpfs.c:997 msgid "ftpfs: aborting transfer." msgstr "ftpfs: прерывание передачи." -#: vfs/ftpfs.c:1007 +#: vfs/ftpfs.c:999 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: Ошибка прерывания: %s" -#: vfs/ftpfs.c:1012 +#: vfs/ftpfs.c:1004 msgid "ftpfs: abort failed" msgstr "ftpfs: сбой прерывания" -#: vfs/ftpfs.c:1101 vfs/ftpfs.c:1200 +#: vfs/ftpfs.c:1093 vfs/ftpfs.c:1192 msgid "ftpfs: CWD failed." msgstr "ftpfs: сбой поиска текущего рабочего каталога." -#: vfs/ftpfs.c:1111 vfs/ftpfs.c:1118 +#: vfs/ftpfs.c:1103 vfs/ftpfs.c:1110 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: невозможно распознать символическую ссылку" -#: vfs/ftpfs.c:1169 +#: vfs/ftpfs.c:1161 msgid "Resolving symlink..." msgstr "Распознается символическая ссылка..." -#: vfs/ftpfs.c:1188 +#: vfs/ftpfs.c:1180 #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" msgstr "ftpfs: Чтение каталога FTP %s... %s%s" -#: vfs/ftpfs.c:1189 +#: vfs/ftpfs.c:1181 msgid "(strict rfc959)" msgstr "(ограничение rfc959)" -#: vfs/ftpfs.c:1190 +#: vfs/ftpfs.c:1182 msgid "(chdir first)" msgstr "(сначала chdir)" -#: vfs/ftpfs.c:1287 +#: vfs/ftpfs.c:1279 msgid "ftpfs: failed" msgstr "ftpfs: ошибка" -#: vfs/ftpfs.c:1297 +#: vfs/ftpfs.c:1289 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: ошибка; некуда перейти на аварийный режим" -#: vfs/ftpfs.c:1360 +#: vfs/ftpfs.c:1352 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: запись файла %d (%d)" -#: vfs/ftpfs.c:1775 +#: vfs/ftpfs.c:1767 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6894,11 +6918,11 @@ msgid "Unexpected EOF on archive file" msgstr "Неожиданный конец архивного файла" -#: vfs/tar.c:339 vfs/tar.c:346 +#: vfs/tar.c:336 vfs/tar.c:343 msgid "Inconsistent tar archive" msgstr "Несогласованный архив tar" -#: vfs/tar.c:411 +#: vfs/tar.c:413 #, c-format msgid "" "Hmm,...\n" @@ -6909,31 +6933,31 @@ "%s\n" "не похож на tar-архив." -#: vfs/vfs.c:1151 +#: vfs/vfs.c:1139 msgid "Changes to file lost" msgstr "Изменения для файла потеряны" -#: vfs/vfs.c:1794 +#: vfs/vfs.c:1781 msgid "Could not parse:" msgstr "Невозможно проанализировать:" -#: vfs/vfs.c:1796 +#: vfs/vfs.c:1783 msgid "More parsing errors will be ignored." msgstr "Остальные ошибки анализа будут проигнорированы." -#: vfs/vfs.c:1796 +#: vfs/vfs.c:1783 msgid "(sorry)" msgstr "(извините)" -#: vfs/vfs.c:1807 +#: vfs/vfs.c:1794 msgid "Internal error:" msgstr " Внутренняя ошибка:" -#: vfs/vfs.c:1817 +#: vfs/vfs.c:1804 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "%s: %s: %s %3d%% (%ld байт перенесено)" -#: vfs/vfs.c:1818 +#: vfs/vfs.c:1805 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld байт перенесено" Binary files old/mc-4.5.49/po/sk.gmo and new/mc-4.5.50/po/sk.gmo differ Binary files old/mc-4.5.49/po/sv.gmo and new/mc-4.5.50/po/sv.gmo differ Binary files old/mc-4.5.49/po/tr.gmo and new/mc-4.5.50/po/tr.gmo differ Binary files old/mc-4.5.49/po/uk.gmo and new/mc-4.5.50/po/uk.gmo differ Binary files old/mc-4.5.49/po/wa.gmo and new/mc-4.5.50/po/wa.gmo differ Binary files old/mc-4.5.49/po/zh_CN.GB2312.gmo and new/mc-4.5.50/po/zh_CN.GB2312.gmo differ Binary files old/mc-4.5.49/po/zh_TW.Big5.gmo and new/mc-4.5.50/po/zh_TW.Big5.gmo differ diff -ruN old/mc-4.5.49/src/ChangeLog new/mc-4.5.50/src/ChangeLog --- old/mc-4.5.49/src/ChangeLog Wed May 24 14:30:33 2000 +++ new/mc-4.5.50/src/ChangeLog Mon May 29 17:56:25 2000 @@ -1,3 +1,20 @@ +2000-05-25 Andrew V. Samoilov + + * slint.c (init_pair): segfault fixed when mcedit -b called + + * user.c (check_format_var): error messages are localized + + (expand_format, user_menu_cmd): memory leaking for %e and %k macro + fixed; segfault fixed when %m macro is used outside user_menu_cmd () + + * ext.c (regex_command): memory leaking fixed when user extension + file is absent + + (exec_extension): error message for changed mc.ext file format + are localized -- does we really must be worry about mc 3.0 ? + + * widget.c (history_put): counter is initialized again + 2000-05-11 Valery Kornienkov src/user.c: fix segfault when Shift-F4, Shift-F1, so when menu diff -ruN old/mc-4.5.49/src/ext.c new/mc-4.5.50/src/ext.c --- old/mc-4.5.49/src/ext.c Wed May 24 14:30:32 2000 +++ new/mc-4.5.50/src/ext.c Mon May 29 17:56:22 2000 @@ -354,9 +354,7 @@ char *regex_command_title = NULL; char *regex_command (char *filename, char *action, char **drops, int *move_dir) { - char *extension_file; char *p, *q, *r, c; - char *buffer; int file_len = strlen (filename); int found = 0; char content_string [2048]; @@ -386,24 +384,28 @@ asked_file = 0; if (data == NULL) { + char *extension_file; + int mc_user_ext = 1; int home_error = 0; - buffer = concat_dir_and_file (home_dir, MC_USER_EXT); - if (exist_file (buffer)) - extension_file = buffer; - else + extension_file = concat_dir_and_file (home_dir, MC_USER_EXT); + if (!exist_file (extension_file)) { + g_free (extension_file); check_stock_mc_ext: extension_file = concat_dir_and_file (mc_home, MC_LIB_EXT); - if ((data = load_file (extension_file)) == NULL) { - g_free (buffer); - return 0; + mc_user_ext = 0; } + data = load_file (extension_file); + g_free (extension_file); + if (data == NULL) + return 0; + if (!strstr (data, "default/")) { if (!strstr (data, "regex/") && !strstr (data, "shell/") && !strstr (data, "type/")) { g_free (data); data = NULL; - if (extension_file == buffer) { + if (mc_user_ext) { home_error = 1; goto check_stock_mc_ext; } else { @@ -412,7 +414,7 @@ msg = g_strconcat (" ", mc_home, MC_LIB_EXT, _(" file error"), NULL); msg2 = g_strconcat (_("Format of the "), mc_home, -("mc.ext file has changed\n\ +_("mc.ext file has changed\n\ with version 3.0. It seems that installation\n\ failed. Please fetch a fresh new copy from the\n\ Midnight Commander package or in case you don't\n\ @@ -420,7 +422,6 @@ message (1, msg, msg2); g_free (msg); g_free (msg2); - g_free (buffer); return 0; } } @@ -438,7 +439,6 @@ g_free (msg); g_free (msg2); } - g_free (buffer); } mc_stat (filename, &mystat); diff -ruN old/mc-4.5.49/src/slint.c new/mc-4.5.50/src/slint.c --- old/mc-4.5.49/src/slint.c Wed May 24 14:30:32 2000 +++ new/mc-4.5.50/src/slint.c Mon May 29 17:56:24 2000 @@ -132,6 +132,7 @@ slinterrupt = 1; } +#if 0 static int interrupts_enabled (void) { @@ -140,6 +141,7 @@ sigaction (SIGINT, NULL, ¤t_act); return current_act.sa_handler == slang_intr; } +#endif void enable_interrupt_key(void) @@ -355,7 +357,7 @@ init_pair (int index, char *foreground, char *background) { /* hack for transparent background for Eterm, rxvt or else */ - if (!strcmp(background, "default")) + if (background && !strcmp (background, "default")) background = NULL; /* if foreground is default, I guess we should use normal fore-color. */ diff -ruN old/mc-4.5.49/src/user.c new/mc-4.5.50/src/user.c --- old/mc-4.5.49/src/user.c Wed May 24 14:30:32 2000 +++ new/mc-4.5.50/src/user.c Mon May 29 17:56:22 2000 @@ -44,7 +44,7 @@ #include "view.h" /* for default_* externs */ -/* "$Id: user.c,v 1.17 2000/05/12 20:05:59 miguel Exp $" */ +/* "$Id: user.c,v 1.18 2000/05/25 16:21:42 pavel Exp $" */ #define MAX_ENTRIES 16 #define MAX_ENTRY_LEN 60 @@ -52,7 +52,7 @@ static int debug_flag = 0; static int debug_error = 0; static WEdit *s_editwidget; -static char *menu; +static char *menu = NULL; /* Formats defined: %% The % character @@ -134,9 +134,9 @@ if (!dots || dots == q+5){ message (1, - " Format error on file Extensions File ", - !dots ? " The %%var macro does not have a default " - : " The %%var macros does not have a variable " ); + _(" Format error on file Extensions File "), + _(!dots ? N_(" The %%var macro does not have a default ") + : N_(" The %%var macros does not have a variable "))); return 0; } @@ -218,15 +218,17 @@ if (s_editwidget && s_editwidget->syntax_type) return g_strdup (s_editwidget->syntax_type); break; - case 'e': - /* error file name */ - return (*quote_func) (g_strconcat (home_dir, ERROR_FILE, NULL), 0); - case 'k': - /* block file name */ - return (*quote_func) (g_strconcat (home_dir, BLOCK_FILE, NULL), 0); - case 'm': - /* menu file name */ - return (*quote_func) (menu, 0); + case 'e': /* error file name */ + case 'k': /* block file name */ { + char *file = g_strconcat (home_dir, (c == 'e') ? ERROR_FILE : BLOCK_FILE, NULL); + fname = (*quote_func) (file, 0); + g_free (file); + return fname; + } + case 'm': /* menu file name */ + if (menu) + return (*quote_func) (menu, 0); + break; /* Fall through */ @@ -687,6 +689,7 @@ message (1, MSG_ERROR, _(" Can't open file %s \n %s "), menu, unix_error_string (errno)); g_free (menu); + menu = NULL; return; } @@ -762,16 +765,10 @@ col++; } } + if (menu_lines == 0) { - g_free (data); - if (entries) - g_free (entries); - /* FIXME: this message is not quite right */ - message (1, MSG_ERROR, _(" Empty file %s "), menu); - g_free (menu); - easy_patterns = old_patterns; - return; - } + message (1, MSG_ERROR, _(" No appropriative entries found in %s "), menu); + } else { max_cols = min (max (max_cols, col), MAX_ENTRY_LEN); @@ -792,9 +789,13 @@ if (selected >= 0) execute_menu_command (entries [selected]); - easy_patterns = old_patterns; do_refresh (); + } + + easy_patterns = old_patterns; g_free (menu); - g_free (entries); + menu = NULL; + if (entries) + g_free (entries); g_free (data); } diff -ruN old/mc-4.5.49/src/widget.c new/mc-4.5.50/src/widget.c --- old/mc-4.5.49/src/widget.c Wed May 24 14:30:32 2000 +++ new/mc-4.5.50/src/widget.c Mon May 29 17:56:22 2000 @@ -23,7 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* "$Id: widget.c,v 1.39 2000/04/18 08:58:42 pavel Exp $" */ +/* "$Id: widget.c,v 1.40 2000/05/25 16:21:42 pavel Exp $" */ #include #include @@ -965,7 +965,7 @@ profile_clean_section (input_name, profile); /* dump histories into profile */ - while (h){ + for (i = 0; h; h = h->next){ if (h->text){ /* probably aren't any null entries, but lets be sure */ @@ -975,7 +975,6 @@ WritePrivateProfileString (input_name, key_name, h->text, profile); } } - h = h->next; } g_free (profile); #endif @@ -1712,16 +1711,14 @@ if (event->x >= in->field_len - HISTORY_BUTTON_WIDTH + 1 && should_show_history_button (in)) { do_show_hist (in); - update_input (in, 1); } else { in->point = strlen (in->buffer); if (event->x - in->first_shown - 1 < in->point) in->point = event->x - in->first_shown - 1; if (in->point < 0) in->point = 0; - - update_input (in, 1); - } + } + update_input (in, 1); } #endif return MOU_NORMAL; diff -ruN old/mc-4.5.49/vfs/ChangeLog new/mc-4.5.50/vfs/ChangeLog --- old/mc-4.5.49/vfs/ChangeLog Wed May 24 14:30:29 2000 +++ new/mc-4.5.50/vfs/ChangeLog Mon May 29 17:56:08 2000 @@ -1,3 +1,7 @@ +2000-05-23 Andrew V. Samoilov + + * vfs.c (mc_[un]def_getlocalcopy): better error handling on writing + 2000-05-18 Andrew V. Samoilov * ftpfs.c: (my_get_host_and_username) space between macro name and diff -ruN old/mc-4.5.49/vfs/samba/include/config.h new/mc-4.5.50/vfs/samba/include/config.h --- old/mc-4.5.49/vfs/samba/include/config.h Wed May 24 14:30:30 2000 +++ new/mc-4.5.50/vfs/samba/include/config.h Mon May 29 17:56:11 2000 @@ -104,7 +104,7 @@ /* #undef HAVE_TRAPDOOR_UID */ /* #undef HAVE_ROOT */ /* #undef HAVE_UNION_SEMUN */ -#define HAVE_NETMASK_IFCONF 1 +/* #undef HAVE_NETMASK_IFCONF */ #define HAVE_GETTIMEOFDAY_TZ 1 /* #undef HAVE_SOCK_SIN_LEN */ /* #undef STAT_READ_FILSYS */ diff -ruN old/mc-4.5.49/vfs/samba/include/stamp-h new/mc-4.5.50/vfs/samba/include/stamp-h --- old/mc-4.5.49/vfs/samba/include/stamp-h Wed May 24 14:30:30 2000 +++ new/mc-4.5.50/vfs/samba/include/stamp-h Mon May 29 17:56:12 2000 @@ -1 +1 @@ -Sun Feb 13 22:29:14 UTC 2000 +Tue May 23 19:28:06 UTC 2000 diff -ruN old/mc-4.5.49/vfs/vfs.c new/mc-4.5.50/vfs/vfs.c --- old/mc-4.5.49/vfs/vfs.c Wed May 24 14:30:29 2000 +++ new/mc-4.5.50/vfs/vfs.c Mon May 29 17:56:09 2000 @@ -5,7 +5,7 @@ 1995 Jakub Jelinek 1998 Pavel Machek - $Id: vfs.c,v 1.59 2000/05/16 14:59:33 pavel Exp $ + $Id: vfs.c,v 1.60 2000/05/25 14:47:48 pavel Exp $ This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License @@ -1064,12 +1064,12 @@ fdout = open (tmp, O_CREAT|O_WRONLY|O_TRUNC|O_EXCL, 0600); if (fdout == -1) goto fail; - while ((i = mc_read (fdin, buffer, sizeof (buffer))) > 0) - write (fdout, buffer, i); + while ((i = mc_read (fdin, buffer, sizeof (buffer))) > 0){ + if (write (fdout, buffer, i) != i) + goto fail; + } if (i == -1) goto fail; - if (write (fdout, buffer, i)==-1) - goto fail; i = mc_close (fdin); fdin = -1; if (i==-1) @@ -1117,15 +1117,13 @@ fdout = mc_open (filename, O_WRONLY | O_TRUNC); if (fdout == -1) goto failed; - while ((i = read (fdin, buffer, sizeof (buffer))) == sizeof (buffer)){ - mc_write (fdout, buffer, i); - } + while ((i = read (fdin, buffer, sizeof (buffer))) > 0){ + if (mc_write (fdout, buffer, i) != i) + goto failed; + } if (i == -1) goto failed; - if (mc_write (fdout, buffer, i) == -1) - goto failed; - if (close (fdin)==-1) goto failed; if (mc_close (fdout)==-1) { @@ -1321,7 +1319,6 @@ { char *original = p; int numcols; - for (numcols = 0; *p && numcols < MAXCOLS; numcols++){ while (*p == ' ' || *p == '\r' || *p == '\n'){