From 74a5710f99454cbcfd63e0ee90f704e4fb291945 Mon Sep 17 00:00:00 2001 From: Massimo Melina Date: Sat, 6 Jun 2020 17:16:45 +0200 Subject: [PATCH] fix: conflicting resource text for translation http://rejetto.com/forum/index.php?topic=13313.msg1065920#msg1065920 --- .gitignore | 1 + hfs.drc | 206 ++++++++++++++++++++++++++--------------------------- hfs.lng | 195 +++++++++++++++++++++++++------------------------- hfs.res | Bin 32856 -> 32856 bytes main.pas | 10 ++- 5 files changed, 204 insertions(+), 208 deletions(-) diff --git a/.gitignore b/.gitignore index 088b798..1043007 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ __history/ __recovery/ win32/ .vscode/ +.idea/ *.vfs *.dcu *.exe diff --git a/hfs.drc b/hfs.drc index 9a4621c..1d1d574 100644 --- a/hfs.drc +++ b/hfs.drc @@ -8,97 +8,96 @@ resources were bound to the produced executable. */ -#define main_MSG_NUM_ADDR 64656 -#define main_MSG_NUM_ADDR_DL 64657 -#define main_MSG_MAX_LINES 64658 -#define main_MSG_APACHE_LOG_FMT 64659 -#define main_MSG_APACHE_LOG_FMT_LONG 64660 -#define main_MSG_ICONS_ADDED 64661 -#define main_MSG_DDNS_DISABLED 64662 -#define main_MSG_MD5_WARN 64663 -#define main_MSG_AUTO_MD5 64664 -#define main_MSG_AUTO_MD5_LONG 64665 -#define main_MSG_UPL_HOWTO 64666 -#define main_MSG_EVENTS_HLP 64672 -#define main_MSG_EDIT_RES 64673 -#define main_MSG_TPL_USE_MACROS 64674 -#define main_REMOVE_SHELL 64675 -#define main_S_OFF 64676 -#define main_S_ON 64677 -#define main_LOG 64678 -#define main_MSG_RE_NOIP 64679 -#define main_MSG_TRAY_DEF 64680 -#define main_MSG_CLEAN_START 64681 -#define main_MSG_RESTORE_BAK 64682 -#define main_MSG_EXT_ADDR_FAIL 64683 -#define main_MSG_TO_EXPERT 64684 -#define main_MSG_DONT_LOG_HINT 64685 -#define main_MSG_DL_PERC 64686 -#define main_MSG_UNINSTALL_WARN 64687 -#define main_MSG_SELF_3 64688 -#define main_MSG_SELF_6 64689 -#define main_MSG_SELF_7 64690 -#define main_MSG_RET_EXT 64691 -#define main_MSG_SELF_CANT_ON 64692 -#define main_MSG_SELF_CANT_LIST 64693 -#define main_MSG_SELF_CANT_S 64694 -#define main_MSG_SELF_ING 64695 -#define main_MSG_TEST_CANC 64696 -#define main_MSG_TEST_INET 64697 -#define main_MSG_SELF_UNAV 64698 -#define main_MSG_SELF_NO_INET 64699 -#define main_MSG_SELF_NO_ANSWER 64700 -#define main_MSG_OPEN_BROW 64701 -#define main_MSG_OPEN_BROW_LONG 64702 -#define main_MSG_HIDE_PORT 64703 -#define main_MSG_RESET_TOT 64704 -#define main_MSG_DISAB_FIND_EXT 64705 -#define main_MSG_ENT_URL 64706 -#define main_MSG_ENT_URL_LONG 64707 -#define main_MSG_ENT_USR 64708 -#define main_MSG_ENT_PWD 64709 -#define main_MSG_ENT_HOST 64710 -#define main_MSG_ENT_HOST_LONG 64711 -#define main_MSG_HOST_FORM 64712 -#define main_MSG_MIN_SPACE 64713 -#define main_MSG_MIN_SPACE_LONG 64714 -#define main_MSG_REN_PART 64715 -#define main_MSG_REN_PART_LONG 64716 -#define main_MSG_SELF_BEFORE 64717 -#define main_MSG_SELF_OK 64718 -#define main_MSG_SELF_OK_PORT 64719 -#define main_MSG_LOG_FILE 64720 -#define main_MSG_LOG_FILE_LONG 64721 -#define main_MSG_SET_URL 64722 -#define main_MSG_SET_URL_LONG 64723 -#define main_MSG_REALM 64724 -#define main_MSG_REALM_LONG 64725 -#define main_MSG_INACT_TIMEOUT 64726 -#define main_MSG_INACT_TIMEOUT_LONG 64727 -#define main_MSG_CHANGES_LOST 64728 -#define main_MSG_FLAG_NEW 64729 -#define main_MSG_FLAG_NEW_LONG 64730 -#define main_MSG_DONT_LOG_MASK 64731 -#define main_MSG_DONT_LOG_MASK_LONG 64732 -#define main_MSG_CUST_IP 64733 -#define main_MSG_CUST_IP_LONG 64734 -#define main_MSG_NO_EXT_IP 64735 -#define main_MSG_TENTH_SEC 64736 -#define main_MSG_LOADING_VFS 64737 -#define main_MSG_VFS_OLD 64738 -#define main_MSG_UNK_FK 64739 -#define main_MSG_VIS_ONLY_ANON 64740 -#define main_MSG_AUTO_DISABLED 64741 -#define main_MSG_CORRUPTED 64742 -#define main_MSG_MACROS_FOUND 64743 -#define main_MSG_UPD_INFO 64744 -#define main_MSG_NEWER 64745 -#define main_MSG_SRC_UPD 64746 -#define main_ARE_EXPERT 64747 -#define main_ARE_EASY 64748 -#define main_SW2EXPERT 64749 -#define main_SW2EASY 64750 -#define main_MSG_DL_TIMEOUT_LONG 64751 +#define main_MSG_NUM_ADDR_DL 64656 +#define main_MSG_MAX_LINES 64657 +#define main_MSG_APACHE_LOG_FMT 64658 +#define main_MSG_APACHE_LOG_FMT_LONG 64659 +#define main_MSG_ICONS_ADDED 64660 +#define main_MSG_DDNS_DISABLED 64661 +#define main_MSG_MD5_WARN 64662 +#define main_MSG_AUTO_MD5 64663 +#define main_MSG_AUTO_MD5_LONG 64664 +#define main_MSG_UPL_HOWTO 64665 +#define main_MSG_EDIT_RES 64672 +#define main_MSG_TPL_USE_MACROS 64673 +#define main_REMOVE_SHELL 64674 +#define main_S_OFF 64675 +#define main_S_ON 64676 +#define main_LOG 64677 +#define main_MSG_RE_NOIP 64678 +#define main_MSG_TRAY_DEF 64679 +#define main_MSG_CLEAN_START 64680 +#define main_MSG_RESTORE_BAK 64681 +#define main_MSG_EXT_ADDR_FAIL 64682 +#define main_MSG_TO_EXPERT 64683 +#define main_MSG_DONT_LOG_HINT 64684 +#define main_MSG_DL_PERC 64685 +#define main_MSG_UNINSTALL_WARN 64686 +#define main_MSG_NUM_ADDR 64687 +#define main_MSG_SELF_6 64688 +#define main_MSG_SELF_7 64689 +#define main_MSG_RET_EXT 64690 +#define main_MSG_SELF_CANT_ON 64691 +#define main_MSG_SELF_CANT_LIST 64692 +#define main_MSG_SELF_CANT_S 64693 +#define main_MSG_SELF_ING 64694 +#define main_MSG_TEST_CANC 64695 +#define main_MSG_TEST_INET 64696 +#define main_MSG_SELF_UNAV 64697 +#define main_MSG_SELF_NO_INET 64698 +#define main_MSG_SELF_NO_ANSWER 64699 +#define main_MSG_OPEN_BROW 64700 +#define main_MSG_OPEN_BROW_LONG 64701 +#define main_MSG_HIDE_PORT 64702 +#define main_MSG_EVENTS_HLP 64703 +#define main_MSG_DISAB_FIND_EXT 64704 +#define main_MSG_ENT_URL 64705 +#define main_MSG_ENT_URL_LONG 64706 +#define main_MSG_ENT_USR 64707 +#define main_MSG_ENT_PWD 64708 +#define main_MSG_ENT_HOST 64709 +#define main_MSG_ENT_HOST_LONG 64710 +#define main_MSG_HOST_FORM 64711 +#define main_MSG_MIN_SPACE 64712 +#define main_MSG_MIN_SPACE_LONG 64713 +#define main_MSG_REN_PART 64714 +#define main_MSG_REN_PART_LONG 64715 +#define main_MSG_SELF_BEFORE 64716 +#define main_MSG_SELF_OK 64717 +#define main_MSG_SELF_OK_PORT 64718 +#define main_MSG_SELF_3 64719 +#define main_MSG_LOG_FILE_LONG 64720 +#define main_MSG_SET_URL 64721 +#define main_MSG_SET_URL_LONG 64722 +#define main_MSG_REALM 64723 +#define main_MSG_REALM_LONG 64724 +#define main_MSG_INACT_TIMEOUT 64725 +#define main_MSG_INACT_TIMEOUT_LONG 64726 +#define main_MSG_CHANGES_LOST 64727 +#define main_MSG_FLAG_NEW 64728 +#define main_MSG_FLAG_NEW_LONG 64729 +#define main_MSG_DONT_LOG_MASK 64730 +#define main_MSG_DONT_LOG_MASK_LONG 64731 +#define main_MSG_CUST_IP 64732 +#define main_MSG_CUST_IP_LONG 64733 +#define main_MSG_NO_EXT_IP 64734 +#define main_MSG_RESET_TOT 64735 +#define main_MSG_LOADING_VFS 64736 +#define main_MSG_VFS_OLD 64737 +#define main_MSG_UNK_FK 64738 +#define main_MSG_VIS_ONLY_ANON 64739 +#define main_MSG_AUTO_DISABLED 64740 +#define main_MSG_CORRUPTED 64741 +#define main_MSG_MACROS_FOUND 64742 +#define main_MSG_UPD_INFO 64743 +#define main_MSG_NEWER 64744 +#define main_MSG_SRC_UPD 64745 +#define main_ARE_EXPERT 64746 +#define main_ARE_EASY 64747 +#define main_SW2EXPERT 64748 +#define main_SW2EASY 64749 +#define main_MSG_DL_TIMEOUT_LONG 64750 +#define main_MSG_LOG_FILE 64751 #define main_MSG_ZLIB 64752 #define main_MSG_BAKAVAILABLE 64753 #define main_MSG_CANT_LOAD_SAVE 64754 @@ -109,12 +108,12 @@ #define main_MSG_LIM0 64759 #define main_MSG_MAX_BW_1 64760 #define main_MSG_GRAPH_RATE_MENU 64761 -#define main_MSG_MAX_SIM 64762 +#define main_MSG_MAX_CON_LONG 64762 #define main_MSG_WARN_CONN 64763 #define main_MSG_WARN_ACT_DL 64764 -#define main_MSG_MAX_SIM_SING 64765 -#define main_MSG_MAX_SIM_DL_SING 64766 -#define main_MSG_GRAPH_RATE 64767 +#define main_MSG_MAX_CON_SING_LONG 64765 +#define main_MSG_GRAPH_RATE 64766 +#define main_MSG_TENTH_SEC 64767 #define main_MSG_CON_STATE_IDLE 64768 #define main_MSG_CON_STATE_REQ 64769 #define main_MSG_CON_STATE_RCV 64770 @@ -885,7 +884,6 @@ #define System_SysConst_SDiskFull 65535 STRINGTABLE BEGIN - main_MSG_NUM_ADDR, L"In this moment there are %d different addresses" main_MSG_NUM_ADDR_DL, L"In this moment there are %d different addresses downloading" main_MSG_MAX_LINES, L"Max lines on screen." main_MSG_APACHE_LOG_FMT, L"Apache log file format" @@ -896,7 +894,6 @@ BEGIN main_MSG_AUTO_MD5, L"Auto fingerprint" main_MSG_AUTO_MD5_LONG, L"When you add files and no fingerprint is found, it is calculated.\rTo avoid long waitings, set a limit to file size (in KiloBytes).\rLeave empty to disable, and have no fingerprint created." main_MSG_UPL_HOWTO, L"1. Add a folder (choose \"real folder\")\r\rYou should now see a RED folder in your virtual file sytem, inside HFS\r\r2. Right click on this folder\r3. Properties -> Permissions -> Upload\r4. Check on \"Anyone\"\r5. Ok\r\rNow anyone who has access to your HFS server can upload files to you." - main_MSG_EVENTS_HLP, L"For help on how to use this file please refer http://www.rejetto.com/wiki/?title=HFS:_Event_scripts" main_MSG_EDIT_RES, L"Edit resource" main_MSG_TPL_USE_MACROS, L"The current template is using macros.\rDo you want to cancel this action?" main_REMOVE_SHELL, L"Remove from shell context menu" @@ -912,7 +909,7 @@ BEGIN main_MSG_DONT_LOG_HINT, L"Select the files/folder you don't want to be logged,\rthen right click and select \"Don't log\"." main_MSG_DL_PERC, L"Downloading %d%%" main_MSG_UNINSTALL_WARN, L"Delete HFS and all settings?" - main_MSG_SELF_3, L"You may be behind a router or firewall." + main_MSG_NUM_ADDR, L"In this moment there are %d different addresses" main_MSG_SELF_6, L"You are behind a router.\rEnsure it is configured to forward port %s to your computer." main_MSG_SELF_7, L"You may be behind a firewall.\rEnsure nothing is blocking HFS." main_MSG_RET_EXT, L"Retrieving external address..." @@ -928,7 +925,7 @@ BEGIN main_MSG_OPEN_BROW, L"Open directly in browser" main_MSG_OPEN_BROW_LONG, L"\"Suggest\" the browser to open directly the specified files.\rOther files should pop up a save dialog." main_MSG_HIDE_PORT, L"You should not use this option unless you really know its meaning.\rContinue?" - main_MSG_RESET_TOT, L"Do you want to reset total in/out?" + main_MSG_EVENTS_HLP, L"For help on how to use this file please refer http://www.rejetto.com/wiki/?title=HFS:_Event_scripts" main_MSG_DISAB_FIND_EXT, L"This option makes pointless the option \"Find external address at startup\", which has now been disabled for your convenience." main_MSG_ENT_URL, L"Enter URL" main_MSG_ENT_URL_LONG, L"Enter URL for updating.\r%ip% will be translated to your external IP." @@ -944,7 +941,7 @@ BEGIN main_MSG_SELF_BEFORE, L"Here you can test if your server does work on the Internet.\rIf you are not interested in serving files over the Internet, this is NOT for you.\r\rWe'll now perform a test involving network activity.\rIn order to complete this test, you may need to allow HFS's activity in your firewall, by clicking Allow on the warning prompt.\r\rWARNING: for the duration of the test, all ban rules and limits on the number of connections won't apply." main_MSG_SELF_OK, L"The test is successful. The server should be working fine." main_MSG_SELF_OK_PORT, L"Port %s is not working, but another working port has been found and set: %s." - main_MSG_LOG_FILE, L"Log file" + main_MSG_SELF_3, L"You may be behind a router or firewall." main_MSG_LOG_FILE_LONG, L"This function does not save any previous information to the log file.\rInstead, it saves all information that appears in the log box in real-time (from when you click \"OK\", below).\rSpecify a filename for the log.\rIf you leave the filename blank, no log file is saved.\r\rHere are some symbols you can use in the filename to split the log:\r %d% -- day of the month (1..31)\r %m% -- month (1..12)\r %y% -- year (2000..)\r %dow% -- day of the week (0..6)\r %w% -- week of the year (1..53)\r %user% -- username surrounded by parenthesis" main_MSG_SET_URL, L"Set URL" main_MSG_SET_URL_LONG, L"Please insert an URL for the link\r\rDo not forget to specify http:// or whatever.\r%%ip%% will be translated to your address" @@ -960,7 +957,7 @@ BEGIN main_MSG_CUST_IP, L"Custom IP addresses" main_MSG_CUST_IP_LONG, L"Specify your addresses, each per line" main_MSG_NO_EXT_IP, L"Can't find external address\r( %s )" - main_MSG_TENTH_SEC, L"Tenths of second" + main_MSG_RESET_TOT, L"Do you want to reset total in/out?" main_MSG_LOADING_VFS, L"Loading VFS" main_MSG_VFS_OLD, L"This file is old and uses different settings.\rThe \"let browse\" folder option will be reset.\rRe-saving the file will update its format." main_MSG_UNK_FK, L"This file has been created with a newer version.\rSome data was discarded because unknown.\rIf you save the file now, the discarded data will NOT be saved." @@ -976,6 +973,7 @@ BEGIN main_SW2EXPERT, L"Switch to Expert mode" main_SW2EASY, L"Switch to Easy mode" main_MSG_DL_TIMEOUT_LONG, L"Enter the number of MINUTES with no download after which the program automatically shuts down.\rLeave blank to get no timeout." + main_MSG_LOG_FILE, L"Log file" main_MSG_ZLIB, L"This file is corrupted (ZLIB)." main_MSG_BAKAVAILABLE, L"This file is corrupted but a backup is available.\rContinue with backup?" main_MSG_CANT_LOAD_SAVE, L"Cannot load or save while adding files" @@ -986,12 +984,12 @@ BEGIN main_MSG_LIM0, L"Zero is an effective limit.\rTo disable instead, leave empty." main_MSG_MAX_BW_1, L"Max bandwidth for single address (KB/s)." main_MSG_GRAPH_RATE_MENU, L"Graph refresh rate: %d (tenths of second)" - main_MSG_MAX_SIM, L"Max simultaneous connections to serve.\rMost people don't know this function well, and have problems. If you are unsure, please use the \"Max simultaneous downloads\"." + main_MSG_MAX_CON_LONG, L"Max simultaneous connections to serve.\rMost people don't know this function well, and have problems. If you are unsure, please use the \"Max simultaneous downloads\"." main_MSG_WARN_CONN, L"In this moment there are %d active connections" main_MSG_WARN_ACT_DL, L"In this moment there are %d active downloads" - main_MSG_MAX_SIM_SING, L"Max simultaneous connections to accept from a single IP address.\rMost people don't know this function well, and have problems. If you are unsure, please use the \"Max simultaneous downloads from a single IP address\"." - main_MSG_MAX_SIM_DL_SING, L"Max simultaneous downloads from a single IP address." + main_MSG_MAX_CON_SING_LONG, L"Max simultaneous connections to accept from a single IP address.\rMost people don't know this function well, and have problems. If you are unsure, please use the \"Max simultaneous downloads from a single IP address\"." main_MSG_GRAPH_RATE, L"Graph refresh rate" + main_MSG_TENTH_SEC, L"Tenths of second" main_MSG_CON_STATE_IDLE, L"idle" main_MSG_CON_STATE_REQ, L"requesting" main_MSG_CON_STATE_RCV, L"receiving" diff --git a/hfs.lng b/hfs.lng index 7511279..c524b15 100644 --- a/hfs.lng +++ b/hfs.lng @@ -1,5 +1,5 @@ ; Kryvich's Delphi Localizer Language File. -; Generated by K.D.L. Scanner, 02/06/2020 14:12:28 +; Generated by K.D.L. Scanner, 6/5/2020 6:56:45 PM Humanize=1 HumanizedCR=\^ @@ -452,97 +452,96 @@ Panel1.Button1.Caption=&Yes Panel1.Button2.Caption=&No [ResourceStrings] -64656_main_MSG_NUM_ADDR=In this moment there are %d different addresses -64657_main_MSG_NUM_ADDR_DL=In this moment there are %d different addresses downloading -64658_main_MSG_MAX_LINES=Max lines on screen. -64659_main_MSG_APACHE_LOG_FMT=Apache log file format -64660_main_MSG_APACHE_LOG_FMT_LONG=Here you can specify how to format the log file complying Apache standard.\^Leave blank to get bare copy of screen on file.\^\^Example:\^ %h %l %u %t "%r" %>s %b -64661_main_MSG_ICONS_ADDED=%d new icons added -64662_main_MSG_DDNS_DISABLED=Dynamic DNS updater disabled -64663_main_MSG_MD5_WARN=This option creates an .md5 file for every new calculated fingerprint.\^Use with care to get not your disk invaded by these files. -64664_main_MSG_AUTO_MD5=Auto fingerprint -64665_main_MSG_AUTO_MD5_LONG=When you add files and no fingerprint is found, it is calculated.\^To avoid long waitings, set a limit to file size (in KiloBytes).\^Leave empty to disable, and have no fingerprint created. -64666_main_MSG_UPL_HOWTO=1. Add a folder (choose "real folder")\^\^You should now see a RED folder in your virtual file sytem, inside HFS\^\^2. Right click on this folder\^3. Properties -> Permissions -> Upload\^4. Check on "Anyone"\^5. Ok\^\^Now anyone who has access to your HFS server can upload files to you. -64672_main_MSG_EVENTS_HLP=For help on how to use this file please refer http://www.rejetto.com/wiki/?title=HFS:_Event_scripts -64673_main_MSG_EDIT_RES=Edit resource -64674_main_MSG_TPL_USE_MACROS=The current template is using macros.\^Do you want to cancel this action? -64675_main_REMOVE_SHELL=Remove from shell context menu -64676_main_S_OFF=Switch OFF -64677_main_S_ON{1}=Switch ON -64678_main_LOG=Log -64679_main_MSG_RE_NOIP=You are invited to re-insert your No-IP configuration, otherwise the updater won't work as expected. -64680_main_MSG_TRAY_DEF=%ip%\^Uptime: %uptime%\^Downloads: %downloads% -64681_main_MSG_CLEAN_START=Clean start -64682_main_MSG_RESTORE_BAK=A file system backup has been created for a system shutdown.\^Do you want to restore this backup? -64683_main_MSG_EXT_ADDR_FAIL=Search for external address failed -64684_main_MSG_TO_EXPERT=Switch to expert mode. -64685_main_MSG_DONT_LOG_HINT=Select the files/folder you don't want to be logged,\^then right click and select "Don't log". -64686_main_MSG_DL_PERC=Downloading %d%% -64687_main_MSG_UNINSTALL_WARN=Delete HFS and all settings? -64688_main_MSG_SELF_3=You may be behind a router or firewall. -64689_main_MSG_SELF_6=You are behind a router.\^Ensure it is configured to forward port %s to your computer. -64690_main_MSG_SELF_7=You may be behind a firewall.\^Ensure nothing is blocking HFS. -64691_main_MSG_RET_EXT=Retrieving external address... -64692_main_MSG_SELF_CANT_ON=Unable to switch the server on -64693_main_MSG_SELF_CANT_LIST=Self test cannot be performed because HFS was configured to accept connections only on 127.0.0.1 -64694_main_MSG_SELF_CANT_S=Self test doesn't support HTTPS.\^It's likely it won't work. -64695_main_MSG_SELF_ING=Self testing... -64696_main_MSG_TEST_CANC=Test cancelled -64697_main_MSG_TEST_INET=Testing internet connection... -64698_main_MSG_SELF_UNAV=Sorry, the test is unavailable at the moment -64699_main_MSG_SELF_NO_INET=Your internet connection does not work -64700_main_MSG_SELF_NO_ANSWER=The test failed: server does not answer. -64701_main_MSG_OPEN_BROW=Open directly in browser -64702_main_MSG_OPEN_BROW_LONG="Suggest" the browser to open directly the specified files.\^Other files should pop up a save dialog. -64703_main_MSG_HIDE_PORT=You should not use this option unless you really know its meaning.\^Continue? -64704_main_MSG_RESET_TOT=Do you want to reset total in/out? -64705_main_MSG_DISAB_FIND_EXT=This option makes pointless the option "Find external address at startup", which has now been disabled for your convenience. -64706_main_MSG_ENT_URL=Enter URL -64707_main_MSG_ENT_URL_LONG=Enter URL for updating.\^%ip% will be translated to your external IP. -64708_main_MSG_ENT_USR=Enter user -64709_main_MSG_ENT_PWD=Enter password -64710_main_MSG_ENT_HOST=Enter host -64711_main_MSG_ENT_HOST_LONG=Enter domain (full form!) -64712_main_MSG_HOST_FORM=Please, enter it in the FULL form, with dots -64713_main_MSG_MIN_SPACE=Min disk space -64714_main_MSG_MIN_SPACE_LONG=The upload will fail if your disk has less than the specified amount of free MegaBytes. -64715_main_MSG_REN_PART=Rename partial uploads -64716_main_MSG_REN_PART_LONG=This string will be appended to the filename.\^\^If you need more control, enter a string with %name% in it, and this symbol will be replaced by the original filename. -64717_main_MSG_SELF_BEFORE=Here you can test if your server does work on the Internet.\^If you are not interested in serving files over the Internet, this is NOT for you.\^\^We'll now perform a test involving network activity.\^In order to complete this test, you may need to allow HFS's activity in your firewall, by clicking Allow on the warning prompt.\^\^WARNING: for the duration of the test, all ban rules and limits on the number of connections won't apply. -64718_main_MSG_SELF_OK=The test is successful. The server should be working fine. -64719_main_MSG_SELF_OK_PORT=Port %s is not working, but another working port has been found and set: %s. -64720_main_MSG_LOG_FILE=Log file -64721_main_MSG_LOG_FILE_LONG=This function does not save any previous information to the log file.\^Instead, it saves all information that appears in the log box in real-time (from when you click "OK", below).\^Specify a filename for the log.\^If you leave the filename blank, no log file is saved.\^\^Here are some symbols you can use in the filename to split the log:\^ %d% -- day of the month (1..31)\^ %m% -- month (1..12)\^ %y% -- year (2000..)\^ %dow% -- day of the week (0..6)\^ %w% -- week of the year (1..53)\^ %user% -- username surrounded by parenthesis -64722_main_MSG_SET_URL=Set URL -64723_main_MSG_SET_URL_LONG=Please insert an URL for the link\^\^Do not forget to specify http:// or whatever.\^%%ip%% will be translated to your address -64724_main_MSG_REALM=Login realm -64725_main_MSG_REALM_LONG=The realm string is shown on the user/pass dialog of the browser.\^Here you can customize the realm for the login button -64726_main_MSG_INACT_TIMEOUT=Connection inactivity timeout -64727_main_MSG_INACT_TIMEOUT_LONG=The connection is kicked after a timeout.\^Specify in seconds.\^Leave blank to get no timeout. -64728_main_MSG_CHANGES_LOST=All changes will be lost\^Continue? -64729_main_MSG_FLAG_NEW=Flag new files -64730_main_MSG_FLAG_NEW_LONG=Enter the number of MINUTES files stay flagged from their addition.\^Leave blank to disable. -64731_main_MSG_DONT_LOG_MASK=Do not log address -64732_main_MSG_DONT_LOG_MASK_LONG=Any event from the following IP address mask will be not logged. -64733_main_MSG_CUST_IP=Custom IP addresses -64734_main_MSG_CUST_IP_LONG=Specify your addresses, each per line -64735_main_MSG_NO_EXT_IP=Can't find external address\^( %s ) -64736_main_MSG_TENTH_SEC=Tenths of second -64737_main_MSG_LOADING_VFS=Loading VFS -64738_main_MSG_VFS_OLD=This file is old and uses different settings.\^The "let browse" folder option will be reset.\^Re-saving the file will update its format. -64739_main_MSG_UNK_FK=This file has been created with a newer version.\^Some data was discarded because unknown.\^If you save the file now, the discarded data will NOT be saved. -64740_main_MSG_VIS_ONLY_ANON=This VFS file uses the "Visible only to anonymous users" feature.\^This feature is not available anymore.\^You can achieve similar results by restricting access to @anonymous,\^then enabling "List protected items only for allowed users". -64741_main_MSG_AUTO_DISABLED=Because of the problems encountered in loading,\^automatic saving has been disabled\^until you save manually or load another one. -64742_main_MSG_CORRUPTED=This file does not contain valid data. -64743_main_MSG_MACROS_FOUND=!!!!!!!!! DANGER !!!!!!!!!\^This file contains macros.\^Don't accept macros from people you don't trust.\^\^Trust this file? -64744_main_MSG_UPD_INFO=Last stable version: %s\^\^Last untested version: %s\^ -64783_main_MSG_NEWER=There's a new version available online: %s -64746_main_MSG_SRC_UPD=Searching for updates... -64747_main_ARE_EXPERT{1}=You are in Expert mode -64748_main_ARE_EASY=You are in Easy mode -64749_main_SW2EXPERT=Switch to Expert mode -64750_main_SW2EASY=Switch to Easy mode -64751_main_MSG_DL_TIMEOUT_LONG=Enter the number of MINUTES with no download after which the program automatically shuts down.\^Leave blank to get no timeout. +64656_main_MSG_NUM_ADDR_DL=In this moment there are %d different addresses downloading +64657_main_MSG_MAX_LINES=Max lines on screen. +64658_main_MSG_APACHE_LOG_FMT=Apache log file format +64659_main_MSG_APACHE_LOG_FMT_LONG=Here you can specify how to format the log file complying Apache standard.\^Leave blank to get bare copy of screen on file.\^\^Example:\^ %h %l %u %t "%r" %>s %b +64660_main_MSG_ICONS_ADDED=%d new icons added +64661_main_MSG_DDNS_DISABLED=Dynamic DNS updater disabled +64662_main_MSG_MD5_WARN=This option creates an .md5 file for every new calculated fingerprint.\^Use with care to get not your disk invaded by these files. +64663_main_MSG_AUTO_MD5=Auto fingerprint +64664_main_MSG_AUTO_MD5_LONG=When you add files and no fingerprint is found, it is calculated.\^To avoid long waitings, set a limit to file size (in KiloBytes).\^Leave empty to disable, and have no fingerprint created. +64665_main_MSG_UPL_HOWTO=1. Add a folder (choose "real folder")\^\^You should now see a RED folder in your virtual file sytem, inside HFS\^\^2. Right click on this folder\^3. Properties -> Permissions -> Upload\^4. Check on "Anyone"\^5. Ok\^\^Now anyone who has access to your HFS server can upload files to you. +64672_main_MSG_EDIT_RES=Edit resource +64673_main_MSG_TPL_USE_MACROS=The current template is using macros.\^Do you want to cancel this action? +64674_main_REMOVE_SHELL=Remove from shell context menu +64675_main_S_OFF=Switch OFF +64676_main_S_ON{1}=Switch ON +64677_main_LOG=Log +64678_main_MSG_RE_NOIP=You are invited to re-insert your No-IP configuration, otherwise the updater won't work as expected. +64679_main_MSG_TRAY_DEF=%ip%\^Uptime: %uptime%\^Downloads: %downloads% +64680_main_MSG_CLEAN_START=Clean start +64681_main_MSG_RESTORE_BAK=A file system backup has been created for a system shutdown.\^Do you want to restore this backup? +64682_main_MSG_EXT_ADDR_FAIL=Search for external address failed +64683_main_MSG_TO_EXPERT=Switch to expert mode. +64684_main_MSG_DONT_LOG_HINT=Select the files/folder you don't want to be logged,\^then right click and select "Don't log". +64685_main_MSG_DL_PERC=Downloading %d%% +64686_main_MSG_UNINSTALL_WARN=Delete HFS and all settings? +64687_main_MSG_NUM_ADDR=In this moment there are %d different addresses +64688_main_MSG_SELF_6=You are behind a router.\^Ensure it is configured to forward port %s to your computer. +64689_main_MSG_SELF_7=You may be behind a firewall.\^Ensure nothing is blocking HFS. +64690_main_MSG_RET_EXT=Retrieving external address... +64691_main_MSG_SELF_CANT_ON=Unable to switch the server on +64692_main_MSG_SELF_CANT_LIST=Self test cannot be performed because HFS was configured to accept connections only on 127.0.0.1 +64693_main_MSG_SELF_CANT_S=Self test doesn't support HTTPS.\^It's likely it won't work. +64694_main_MSG_SELF_ING=Self testing... +64695_main_MSG_TEST_CANC=Test cancelled +64696_main_MSG_TEST_INET=Testing internet connection... +64697_main_MSG_SELF_UNAV=Sorry, the test is unavailable at the moment +64698_main_MSG_SELF_NO_INET=Your internet connection does not work +64699_main_MSG_SELF_NO_ANSWER=The test failed: server does not answer. +64700_main_MSG_OPEN_BROW=Open directly in browser +64701_main_MSG_OPEN_BROW_LONG="Suggest" the browser to open directly the specified files.\^Other files should pop up a save dialog. +64702_main_MSG_HIDE_PORT=You should not use this option unless you really know its meaning.\^Continue? +64703_main_MSG_EVENTS_HLP=For help on how to use this file please refer http://www.rejetto.com/wiki/?title=HFS:_Event_scripts +64704_main_MSG_DISAB_FIND_EXT=This option makes pointless the option "Find external address at startup", which has now been disabled for your convenience. +64705_main_MSG_ENT_URL=Enter URL +64706_main_MSG_ENT_URL_LONG=Enter URL for updating.\^%ip% will be translated to your external IP. +64707_main_MSG_ENT_USR=Enter user +64708_main_MSG_ENT_PWD=Enter password +64709_main_MSG_ENT_HOST=Enter host +64710_main_MSG_ENT_HOST_LONG=Enter domain (full form!) +64711_main_MSG_HOST_FORM=Please, enter it in the FULL form, with dots +64712_main_MSG_MIN_SPACE=Min disk space +64713_main_MSG_MIN_SPACE_LONG=The upload will fail if your disk has less than the specified amount of free MegaBytes. +64714_main_MSG_REN_PART=Rename partial uploads +64715_main_MSG_REN_PART_LONG=This string will be appended to the filename.\^\^If you need more control, enter a string with %name% in it, and this symbol will be replaced by the original filename. +64716_main_MSG_SELF_BEFORE=Here you can test if your server does work on the Internet.\^If you are not interested in serving files over the Internet, this is NOT for you.\^\^We'll now perform a test involving network activity.\^In order to complete this test, you may need to allow HFS's activity in your firewall, by clicking Allow on the warning prompt.\^\^WARNING: for the duration of the test, all ban rules and limits on the number of connections won't apply. +64717_main_MSG_SELF_OK=The test is successful. The server should be working fine. +64718_main_MSG_SELF_OK_PORT=Port %s is not working, but another working port has been found and set: %s. +64719_main_MSG_SELF_3=You may be behind a router or firewall. +64720_main_MSG_LOG_FILE_LONG=This function does not save any previous information to the log file.\^Instead, it saves all information that appears in the log box in real-time (from when you click "OK", below).\^Specify a filename for the log.\^If you leave the filename blank, no log file is saved.\^\^Here are some symbols you can use in the filename to split the log:\^ %d% -- day of the month (1..31)\^ %m% -- month (1..12)\^ %y% -- year (2000..)\^ %dow% -- day of the week (0..6)\^ %w% -- week of the year (1..53)\^ %user% -- username surrounded by parenthesis +64721_main_MSG_SET_URL=Set URL +64722_main_MSG_SET_URL_LONG=Please insert an URL for the link\^\^Do not forget to specify http:// or whatever.\^%%ip%% will be translated to your address +64723_main_MSG_REALM=Login realm +64724_main_MSG_REALM_LONG=The realm string is shown on the user/pass dialog of the browser.\^Here you can customize the realm for the login button +64725_main_MSG_INACT_TIMEOUT=Connection inactivity timeout +64726_main_MSG_INACT_TIMEOUT_LONG=The connection is kicked after a timeout.\^Specify in seconds.\^Leave blank to get no timeout. +64727_main_MSG_CHANGES_LOST=All changes will be lost\^Continue? +64728_main_MSG_FLAG_NEW=Flag new files +64729_main_MSG_FLAG_NEW_LONG=Enter the number of MINUTES files stay flagged from their addition.\^Leave blank to disable. +64730_main_MSG_DONT_LOG_MASK=Do not log address +64731_main_MSG_DONT_LOG_MASK_LONG=Any event from the following IP address mask will be not logged. +64732_main_MSG_CUST_IP=Custom IP addresses +64733_main_MSG_CUST_IP_LONG=Specify your addresses, each per line +64734_main_MSG_NO_EXT_IP=Can't find external address\^( %s ) +64735_main_MSG_RESET_TOT=Do you want to reset total in/out? +64736_main_MSG_LOADING_VFS=Loading VFS +64737_main_MSG_VFS_OLD=This file is old and uses different settings.\^The "let browse" folder option will be reset.\^Re-saving the file will update its format. +64738_main_MSG_UNK_FK=This file has been created with a newer version.\^Some data was discarded because unknown.\^If you save the file now, the discarded data will NOT be saved. +64739_main_MSG_VIS_ONLY_ANON=This VFS file uses the "Visible only to anonymous users" feature.\^This feature is not available anymore.\^You can achieve similar results by restricting access to @anonymous,\^then enabling "List protected items only for allowed users". +64740_main_MSG_AUTO_DISABLED=Because of the problems encountered in loading,\^automatic saving has been disabled\^until you save manually or load another one. +64741_main_MSG_CORRUPTED=This file does not contain valid data. +64742_main_MSG_MACROS_FOUND=!!!!!!!!! DANGER !!!!!!!!!\^This file contains macros.\^Don't accept macros from people you don't trust.\^\^Trust this file? +64743_main_MSG_UPD_INFO=Last stable version: %s\^\^Last untested version: %s\^ +64744_main_MSG_NEWER=There's a new version available online: %s +64745_main_MSG_SRC_UPD=Searching for updates... +64746_main_ARE_EXPERT{1}=You are in Expert mode +64747_main_ARE_EASY=You are in Easy mode +64748_main_SW2EXPERT=Switch to Expert mode +64749_main_SW2EASY=Switch to Easy mode +64750_main_MSG_DL_TIMEOUT_LONG=Enter the number of MINUTES with no download after which the program automatically shuts down.\^Leave blank to get no timeout. +64751_main_MSG_LOG_FILE=Log file 64752_main_MSG_ZLIB=This file is corrupted (ZLIB). 64753_main_MSG_BAKAVAILABLE=This file is corrupted but a backup is available.\^Continue with backup? 64754_main_MSG_CANT_LOAD_SAVE=Cannot load or save while adding files @@ -553,12 +552,12 @@ Panel1.Button2.Caption=&No 64759_main_MSG_LIM0=Zero is an effective limit.\^To disable instead, leave empty. 64760_main_MSG_MAX_BW_1=Max bandwidth for single address (KB/s). 64761_main_MSG_GRAPH_RATE_MENU=Graph refresh rate: %d (tenths of second) -64762_main_MSG_MAX_SIM=Max simultaneous connections to serve.\^Most people don't know this function well, and have problems. If you are unsure, please use the "Max simultaneous downloads". +64762_main_MSG_MAX_CON_LONG=Max simultaneous connections to serve.\^Most people don't know this function well, and have problems. If you are unsure, please use the "Max simultaneous downloads". 64763_main_MSG_WARN_CONN=In this moment there are %d active connections 64764_main_MSG_WARN_ACT_DL=In this moment there are %d active downloads -64765_main_MSG_MAX_SIM_SING=Max simultaneous connections to accept from a single IP address.\^Most people don't know this function well, and have problems. If you are unsure, please use the "Max simultaneous downloads from a single IP address". -64766_main_MSG_MAX_SIM_DL_SING{1}=Max simultaneous downloads from a single IP address. -64767_main_MSG_GRAPH_RATE{1}=Graph refresh rate +64765_main_MSG_MAX_CON_SING_LONG=Max simultaneous connections to accept from a single IP address.\^Most people don't know this function well, and have problems. If you are unsure, please use the "Max simultaneous downloads from a single IP address". +64766_main_MSG_GRAPH_RATE{1}=Graph refresh rate +64767_main_MSG_TENTH_SEC=Tenths of second 64768_main_MSG_CON_STATE_IDLE=idle 64769_main_MSG_CON_STATE_REQ=requesting 64770_main_MSG_CON_STATE_RCV=receiving @@ -574,7 +573,7 @@ Panel1.Button2.Caption=&No 64780_main_MSG_ALLO_REF_LONG=Leave empty to disable this feature.\^Here you can specify a mask.\^When a file is requested, if the mask doesn't match the "Referer" HTTP field, the request is rejected. 64781_main_MSG_BETTERSTOP=\^Going on may lead to problems.\^It is adviced to stop loading.\^Stop? 64782_main_MSG_BADCRC=This file is corrupted (CRC). -64783_main_MSG_NEWER{1}=This file has been created with a newer and incompatible version. +64744_main_MSG_NEWER{1}=This file has been created with a newer and incompatible version. 64784_main_MSG_VFS_ARCABLE=Archivable 64785_main_MSG_VFS_DEF_MASK=Default file mask: %s 64786_main_MSG_VFS_ACCESS=Access for @@ -705,7 +704,7 @@ Panel1.Button2.Caption=&No 64911_main_MSG_DDNS_notfqdn=incomplete hostname, required form aaa.bbb.com 64912_main_MSG_MAX_SIM_ADDR{1}=Max simultaneous addresses 64913_main_MSG_MAX_SIM_ADDR_DL=Max simultaneous addresses downloading -64766_main_MSG_MAX_SIM_DL_SING{2}=Max simultaneous downloads from single address +64914_main_MSG_MAX_SIM_DL_SING{2}=Max simultaneous downloads from single address 64915_main_MSG_MAX_SIM_DL=Max simultaneous downloads 64916_main_MSG_SET_LIMIT=Set limit 64917_main_MSG_UNPROTECTED_LINKS=Links are NOT actually protected.\^The feature is there to be used with the "list protected items only..." option.\^Continue? diff --git a/hfs.res b/hfs.res index 57e0c541ce9ef4731f8a27a36e971416fc2d0e11..5d6ffd61cebbfc248725b24d54dbf63fbd374007 100644 GIT binary patch delta 24 gcmcc7z;vU5X+i-r0|Vp4;;oZg7zH+4Fe=mo0B=zUB>(^b delta 26 hcmcc7z;vU5X+i-r3j@={;;pPk40;SEn{^qr>j8C>2b%x@ diff --git a/main.pas b/main.pas index b2d5368..67ea05b 100644 --- a/main.pas +++ b/main.pas @@ -9968,7 +9968,7 @@ end; // setGraphRate procedure TmainFrm.Maxconnections1Click(Sender: TObject); resourcestring - MSG_MAX_SIM = 'Max simultaneous connections to serve.' + MSG_MAX_CON_LONG = 'Max simultaneous connections to serve.' +#13'Most people don''t know this function well, and have problems. If you are unsure, please use the "Max simultaneous downloads".'; MSG_WARN_CONN = 'In this moment there are %d active connections'; var @@ -9976,7 +9976,7 @@ var begin if maxConnections > 0 then s:=intToStr(maxConnections) else s:=''; -if inputquery(MSG_SET_LIMIT, MSG_MAX_SIM+#13+MSG_EMPTY_NO_LIMIT, s) then +if inputquery(MSG_SET_LIMIT, MSG_MAX_CON_LONG+#13+MSG_EMPTY_NO_LIMIT, s) then try setMaxConnections(strToUInt(s)) except msgDlg(MSG_INVALID_VALUE, MB_ICONERROR) end; @@ -10005,7 +10005,7 @@ end; procedure TmainFrm.Maxconnectionsfromsingleaddress1Click(Sender: TObject); resourcestring - MSG_MAX_SIM_SING = 'Max simultaneous connections to accept from a single IP address.' + MSG_MAX_CON_SING_LONG = 'Max simultaneous connections to accept from a single IP address.' +#13'Most people don''t know this function well, and have problems. If you are unsure, please use the "Max simultaneous downloads from a single IP address".'; var s: string; @@ -10014,7 +10014,7 @@ var begin if maxConnectionsIP > 0 then s:=intToStr(maxConnectionsIP) else s:=''; -if inputquery(MSG_SET_LIMIT, MSG_MAX_SIM_SING+#13+MSG_EMPTY_NO_LIMIT, s) then +if inputquery(MSG_SET_LIMIT, MSG_MAX_CON_SING_LONG+#13+MSG_EMPTY_NO_LIMIT, s) then try setMaxConnectionsIP(strToUInt(s)) except msgDlg(MSG_INVALID_VALUE, MB_ICONERROR) end; @@ -10029,8 +10029,6 @@ if assigned(addresses) then end; procedure TmainFrm.MaxDLsIP1Click(Sender: TObject); -resourcestring - MSG_MAX_SIM_DL_SING = 'Max simultaneous downloads from a single IP address.'; var s: string; addresses: TStringDynArray;