diff --git a/config/mldonkey/bittorrent.ini b/config/mldonkey/bittorrent.ini
index 14faf87c5..fbb170ee4 100644
--- a/config/mldonkey/bittorrent.ini
+++ b/config/mldonkey/bittorrent.ini
@@ -11,10 +11,11 @@
 
 
 	(* The port to bind the client to *)
+	(* changing this option requires restart of MLDonkey core *)
  client_port = 6882
 
 	(* The UID of this client *)
- client_uid = FVGUYMROG4XDOLN7O4WJZ2KKH7IL5CBE
+ client_uid = FVGUYMROHEXDALLJAB2KACHON6Y5HBUN
 
 	(* Ask the tracker for new sources only if you have fewer than that number of sources *)
  ask_tracker_threshold = 20
@@ -34,9 +35,13 @@
 	(* Number of peers to request from tracker (Negative # = let tracker decide) *)
  numwant = -1
 
-	(* Interval in seconds 'torrents/incoming' is scanned for new torrent files to be downloaded, 0 to deactivate, changes require restart *)
+	(* Interval in seconds 'torrents/incoming' is scanned for new torrent files to be downloaded, 0 to deactivate *)
+	(* changing this option requires restart of MLDonkey core *)
  import_new_torrents_interval = 60.
 
+	(* Number of retries before a tracker is disabled, use 0 to not disable trackers *)
+ tracker_retries = 10
+
 	(* Minimum time in seconds to wait between asking the tracker for sources *)
  min_tracker_reask_interval = 300
 
@@ -47,10 +52,12 @@
  user_agent = default
 
 	(* (internal option) *)
+	(* Do not change this option, internal use only! *)
  options_version = 0
  old_files = []
 
 	(* The port to bind the tracker to *)
+	(* changing this option requires restart of MLDonkey core *)
  tracker_port = 6881
 
 	(* The maximal number of tracked files (to prevend saturation attack) *)
diff --git a/config/mldonkey/directconnect.ini b/config/mldonkey/directconnect.ini
new file mode 100644
index 000000000..1010baed8
--- /dev/null
+++ b/config/mldonkey/directconnect.ini
@@ -0,0 +1,70 @@
+
+
+    (************************************)
+    (*   Never edit options files when  *)
+    (*       the daemon is running      *)
+    (************************************)
+    (* SECTION : DirectConnect *)
+    (* DirectConnect options *)
+    (************************************)
+
+
+
+	(* The port to bind the client to *)
+ client_port = 4444
+
+	(* How many slots are open to other clients *)
+ dc_open_slots = 2
+
+	(* Your login on DC (no spaces !!!) *)
+ login = ""
+
+	(* The URL from which the first server list is downloaded *)
+ servers_list_url = "http://dchublist.com/hublist.config.bz2"
+
+	(* Define here a list of address/passwords/nick triples for hubs in form:
+	    [ ("hubserver.ip.com", "nick1", "pass1");
+	     ("somehub.somewhere.org", "nick2", "pass2");
+	     ("11.22.333.444", "nick3", "pass3");
+	    ] *)
+ hubs_passwords = []
+
+	(* The time a search is active *)
+ search_timeout = 60
+
+	(* Minimum time between automated file tth searches in minutes *)
+ file_search_time = 60
+
+	(* In initialization, the time in seconds we wait connection responses from client *)
+ client_timeout = 90
+
+	(* The maximum time in seconds we wait data from client in downloading *)
+ client_read_timeout = 60
+
+	(* The maximum time in seconds we wait to continue pushing data to client in uploading *)
+ client_write_timeout = 60
+
+	(* How many seconds we wait a client to continue slot before closing and freeing the slot *)
+ wait_for_next_upload = 30
+
+	(* Is this client firewalled (use passive searches) *)
+ firewalled = false
+
+	(* Automatically find alternative sources, if file is unavailable. Also add sources
+	     from searches automatically *)
+ autosearch_by_tth = true
+
+	(* Maximal number of sources to single file *)
+ max_sources_file = 5
+
+	(* The line speed sent in the MyINFO message
+	     eg. Modem, Cable, DSL, Satellite, LAN(T1), LAN(T3) *)
+ client_speed = DSL
+
+	(* (internal option) *)
+	(* Do not change this option, internal use only! *)
+ options_version = 0
+
+(*
+ The following options are not used (errors, obsolete, ...) 
+*)
diff --git a/config/mldonkey/donkey.ini b/config/mldonkey/donkey.ini
index d19961e1e..1a49c61a6 100644
--- a/config/mldonkey/donkey.ini
+++ b/config/mldonkey/donkey.ini
@@ -11,19 +11,20 @@
 
 
 	(* The port used for connection by other donkey clients. *)
+	(* changing this option requires restart of MLDonkey core *)
  port = 4662
 
 	(* The number of servers you want to stay connected to *)
  max_connected_servers = 3
 
-	(* Should mldonkey try to detect sources responsible for corruption and ban them *)
+	(* Should mldonkey try to detect sources responsible for corruption and ban them, currently disabled *)
  reliable_sources = true
 
 	(* Should mldonkey try to detect sources masquerading as others and ban them *)
  ban_identity_thieves = true
 
-	(* A list of server IP to remove from server list.
-	    Servers on this list can't be added, and will eventually be removed *)
+	(* A list of server IP to remove from server list. Can contain single IPs, CIDR ranges, or begin-end ranges.
+	  Servers on this list can't be added, and will eventually be removed *)
  server_black_list = []
 
 	(* immediately close connection to servers that don't grant a High ID *)
@@ -33,15 +34,15 @@
  force_client_high_id = false
 
 	(* Set this option to false if you don't want to
-	    receive new servers from servers *)
- update_server_list_server = true
+	  receive new servers from servers *)
+ update_server_list_server = false
 
 	(* Set this option to false if you don't want to
-	    receive new servers from server.met *)
+	  receive new servers from server.met *)
  update_server_list_server_met = true
 
 	(* Set this option to false if you don't want to
-	    receive new servers from clients *)
+	  receive new servers from clients *)
  update_server_list_client = false
 
 	(* Maximal number of sources for each file *)
@@ -56,9 +57,12 @@
 	(* Enable secure user identification support *)
  enable_sui = true
 
-	(* min connected users for each server *)
+	(* disconnect if server users is smaller *)
  min_users_on_server = 0
 
+	(* maximum number of files published to servers per minute, eMule default 200 *)
+ max_published_files = 200
+
 	(* login of client on eDonkey network (nothing default to global one) *)
  login = ""
 
@@ -86,32 +90,17 @@
 	(* The MD4 of the Overnet client *)
    md4 = F168E4A3FCDADBBF8175AA5DFBAE8B89
 
-	(* These IP addresses cannot be peers. Elements are separated by spaces, wildcard=255 ie: use 192.168.0.255 for 192.168.0.*  *)
-   exclude_peers = [
-    "1.0.0.0";]
-
 	(* Interval (in seconds) before republish files *)
    republish = 10800.
 
-	(* Max number of hits in a search on Overnet *)
-   max_search_hits = 200
-
-	(* Period between two queries in the overnet tree (should not be set under 5) *)
-   query_peer_period = 5.
-
-	(* How long shoud a search on Overnet wait for the last answer before terminating *)
-   search_timeout = 140
-
 	(* allow extended search to search on overnet *)
    search_keyword = true
 
-	(* maximal number of peers to keep overnet connected (should be >2048) *)
-   max_known_peers = 8192
-
 	(* Size of the filename storage used to answer queries *)
    store_size = 2000
 
 	(* port for overnet *)
+	(* changing this option requires restart of MLDonkey core *)
    port = 21984
 }
 
@@ -130,28 +119,12 @@
 	(* The MD4 of the Overnet client *)
    md4 = C5A53009B6AC813961C80F7BD0CC99B4
 
-	(* These IP addresses cannot be peers. Elements are separated by spaces, wildcard=255 ie: use 192.168.0.255 for 192.168.0.*  *)
-   exclude_peers = [
-    "1.0.0.0";]
-
 	(* Interval (in seconds) before republish files *)
    republish = 10800.
 
-	(* Max number of hits in a search on Overnet *)
-   max_search_hits = 200
-
-	(* Period between two queries in the overnet tree (should not be set under 5) *)
-   query_peer_period = 5.
-
-	(* How long shoud a search on Overnet wait for the last answer before terminating *)
-   search_timeout = 140
-
 	(* allow extended search to search on overnet *)
    search_keyword = true
 
-	(* maximal number of peers to keep overnet connected (should be >2048) *)
-   max_known_peers = 8192
-
 	(* Size of the filename storage used to answer queries *)
    store_size = 2000
 
@@ -181,29 +154,17 @@
 
 
 
-	(* Initial score for a new server *)
- initial_score = 5
-
 	(* Max number of UDP packets per round for eXtended Search *)
  max_xs_packets = 30
 
-	(* Max number of messages of Chat remembered *)
- max_dialog_history = 30
-
 	(* Delay used to request file sources *)
  check_client_connections_delay = 180.
 
-	(* The delay between server connection rounds *)
- check_connections_delay = 5.
-
 	(* Timeout on client connections when not queued *)
  client_timeout = 40.
 
-	(* The number of UDP packets you send every check_client_connections_delay *)
- max_udp_sends = 10
-
 	(* Set this option to false if you don't want mldonkey
-	    to change the master servers it is connected to *)
+	  to change the master servers it is connected to *)
  keep_best_server = true
 
 	(* only servers which are set to 'preferred' will be connected, 
@@ -211,32 +172,44 @@
  connect_only_preferred_server = false
 
 	(* Number of servers that can be used to walk
-	between servers *)
+	  between servers *)
  max_walker_servers = 1
 
-	(* The maximal delay a connection with a server should last when walking
-	through the list (should be greater than become_master_delay) *)
+	(* The maximal delay a connection with a server should last when walking through the list *)
  walker_server_lifetime = 300
  log_clients_on_console = false
 
-	(* Allow mldonkey to propagate your sources to other donkey clients *)
- propagate_sources = true
+	(* Allow mldonkey to propagate your sources to other mldonkey clients.
+	   This function is superseeded by eMule-style source exchange,
+	   this option is outdated *)
+ propagate_sources = false
+
+	(* Save sources to file_sources.ini and reload them on core start. *)
+ keep_sources = true
  black_list = true
 
 	(* A list of ports that specify servers to remove
-	    from server list. Servers with ports on this list can't be added, and
-	    will eventually be removed *)
+	  from server list. Servers with ports on this list can't be added, and
+	  will eventually be removed *)
  port_black_list = []
 
 	(* How long should we wait in the queue of another client *)
  queued_timeout = 1800.
 
 	(* How long can a silent client stay in the upload queue *)
- upload_timeout = 1800.
+ upload_timeout = 600.
 
 	(* How long a downloading client can stay in my upload queue (in minutes >5) *)
  upload_lifetime = 90
 
+	(* If true, each client is allowed to receive one chunk, this setting overrides upload_lifetime *)
+ upload_full_chunks = true
+
+	(* If true, each client is allowed to complete only one chunk, independent, if it is empty or
+	   partial. this setting overrides upload_full_chunks and dynamic_upload_lifetime,
+	   but is, as a failsafe, limited by upload_lifetime (should be set reasonable high) *)
+ upload_complete_chunks = false
+
 	(* Each client upload lifetime depends on download-upload ratio *)
  dynamic_upload_lifetime = false
 
@@ -258,7 +231,8 @@
  max_server_age = 2
 
 	(* How often should remove old donkey servers (see max_server_age) be called
-	   (in seconds, 0 to disable) *)
+	  (in seconds, 0 to disable) *)
+	(* changing this option requires restart of MLDonkey core *)
  remove_old_servers_delay = 900.
 
 	(* Minimal number of servers remaining after remove_old_servers *)
@@ -274,11 +248,11 @@
  keep_downloaded_in_old_files = false
 
 	(* true if you want your mldonkey to lose some
-	upload bandwidth sending messages to clients which are banned :) *)
+	  upload bandwidth sending messages to clients which are banned :) *)
  send_warning_messages = false
 
 	(* true if you want your client to ban
-	    clients that try queue jumping (3 reconnections faster than 9 minutes) *)
+	  clients that try queue jumping (3 reconnections faster than 9 minutes) *)
  ban_queue_jumpers = true
 
 	(* true if you want your client IP to be set from servers ID *)
@@ -290,15 +264,16 @@
 	(* Set the maximal rank of a client to be kept as a client *)
  good_client_rank = 500
 
-	(* (only for development tests) *)
- immediate_master = false
-
-	(* (only for development tests) *)
- become_master_delay = 120
-
 	(* (internal option) *)
- options_version = 1
+	(* Do not change this option, internal use only! *)
+ options_version = 4
 
 (*
  The following options are not used (errors, obsolete, ...) 
 *)
+become_master_delay = 120
+immediate_master = false
+max_udp_sends = 10
+check_connections_delay = 5.
+max_dialog_history = 30
+initial_score = 5
diff --git a/config/mldonkey/downloads.ini b/config/mldonkey/downloads.ini
index b0aee397b..94eab8a4b 100644
--- a/config/mldonkey/downloads.ini
+++ b/config/mldonkey/downloads.ini
@@ -22,30 +22,35 @@
 
 
 	(* list of IP address allowed to connect to the core via telnet/GUI/WEB
-	for internal command set: list separated by spaces
-	example for internal command: set allowed_ips "127.0.0.1 192.168.1.2"
-	or for editing the ini-file: list separated by semi-colon
-	example for ini-file: allowed_ips = [ "127.0.0.1"; "192.168.1.2";]
-	wildcard=255 ie: use 192.168.0.255 for 192.168.0.* *)
+	  for internal command set: list separated by spaces
+	  example for internal command: set allowed_ips "127.0.0.0/8 192.168.1.2"
+	  or for editing the ini-file: list separated by semi-colon
+	  example for ini-file: allowed_ips = [ "127.0.0.0/8"; "192.168.1.2";]
+	  CIDR and range notations are supported: ie use 192.168.0.0/24
+	  or 192.168.0.0-192.168.0.255 for 192.168.0.* *)
  allowed_ips = [
-  "255.255.255.255";]
+  "0.0.0.0/0";]
 
 	(* port for Graphical Interfaces *)
+	(* changing this option requires restart of MLDonkey core *)
  gui_port = 4001
 
 	(* port for GiFT Graphical Interfaces interaction. It was 1213, but the default is
-	now 0 for disabled, because it does not check for a password. *)
+	  now 0 for disabled, because it does not check for a password. *)
+	(* changing this option requires restart of MLDonkey core *)
  gift_port = 0
 
 	(* The port used to connect to your client with a WEB browser *)
+	(* changing this option requires restart of MLDonkey core *)
  http_port = 4080
 
 	(* port for user interaction *)
+	(* changing this option requires restart of MLDonkey core *)
  telnet_port = 4000
 
 	(* Aliases to commands. The alias (fist string) has to be
-	whitespaceless, the outcome of the alias (second string)
-	may have spaces (put it in quotation then). *)
+	  whitespaceless, the outcome of the alias (second string)
+	  may have spaces (put it in quotation then). *)
  alias_commands = [
   (quit, q);
   (exit, q);]
@@ -53,21 +58,30 @@
 
     (************************************)
     (* SECTION : Bandwidth *)
-    (*  *)
+    (* Bandwidth options *)
     (************************************)
 
 
 
 	(* The maximal upload rate you can tolerate on your link in kBytes/s (0 = no limit)
 	  The limit will apply on all your connections (clients and servers) and both
-	control and data messages. *)
+	  control and data messages. *)
  max_hard_upload_rate = 10
 
 	(* The maximal download rate you can tolerate on your link in kBytes/s (0 = no limit)
 	  The limit will apply on all your connections (clients and servers) and both
-	control and data messages. *)
+	  control and data messages. Maximum value depends on max_hard_upload_rate:
+	  >= 10    -> unlimited download
+	  < 10 > 3 -> download limited to upload * 4
+	  < 4      -> download limited to upload * 3 *)
  max_hard_download_rate = 50
 
+	(* Second maximal upload rate for easy toggling (use bw_toggle) *)
+ max_hard_upload_rate_2 = 5
+
+	(* Second maximal download rate for easy toggling (use bw_toggle) *)
+ max_hard_download_rate_2 = 20
+
 	(* Maximal number of opened connections *)
  max_opened_connections = 200
 
@@ -77,6 +91,9 @@
 	(* How many slots can be used for upload *)
  max_upload_slots = 5
 
+	(* How many percent of upload slots can be used for downloading files tagged as release *)
+ max_release_slots = 20
+
 	(* Set aside a single reserved slot to upload to friends *)
  friends_upload_slot = true
 
@@ -90,14 +107,14 @@
  max_connections_per_second = 5
 
 	(* list of IP addresses allowed to connect to the core with no limit on
-	upload/download and upload slots.  List separated by spaces, wildcard=255
-	ie: use 192.168.0.255 for 192.168.0.*  *)
+	  upload/download and upload slots.  List separated by spaces, wildcard=255
+	  ie: use 192.168.0.255 for 192.168.0.*  *)
  nolimit_ips = [
   "127.0.0.1";]
 
 	(* This option enables MLdonkey to always read as much data as possible
 	  from a channel, but use more CPU as it must then copy the data in the
-	    channel buffer. *)
+	  channel buffer. *)
  copy_read_buffer = true
 
 
@@ -109,15 +126,15 @@
 
 
 	(* Set to true if you also want mldonkey to run as an overnet client
-	   (enable_donkey must be true) *)
+	  (enable_donkey must be true) *)
  enable_overnet = true
 
 	(* Set to true if you also want mldonkey to run as an kademlia client
-	   (enable_donkey must be true, and only experimental) *)
+	  (enable_donkey must be true, and only experimental) *)
  enable_kademlia = false
 
 	(* Set to true if you want mldonkey to connect to edonkey servers
-	   (enable_donkey must be true, and only experimental) *)
+	  (enable_donkey must be true, and only experimental) *)
  enable_servers = true
 
 	(* Set to true if you also want mldonkey to run as an Bittorrent client *)
@@ -156,41 +173,47 @@
 
 
 	(* The last IP address used for this client *)
- client_ip = "127.0.0.1"
+ client_ip = "192.168.181.70"
 
 	(* Use the IP specified by 'client_ip' instead of trying to determine it
-	    ourself. Don't set this option to true if you have dynamic IP. *)
+	  ourself. Don't set this option to true if you have dynamic IP. *)
  force_client_ip = false
 
+	(* Use http://ip.discoveryvip.com/ip.asp to obtain WAN IP *)
+ discover_ip = true
+
 	(* User agent string (default = "default") *)
  user_agent = default
 
 	(* A list of lines to download on the WEB: each line has
-	    the format: (kind, period, url), where kind is either
-	    'server.met' for a server.met file (also in gz/bz2/zip format)
-	                 containing ed2k server, or
-	    'comments.met' for a file of comments, or
-	    'guarding.p2p' for a blocklist file (also in gz/bz2/zip format), or
-	    'ocl' for file in the ocl format containing overnet peers, or
-	    'contact.dat' for an contact.dat file containing overnet peers,
-	    'nodes.gzip' for a fasttrack nodes.gzip,
-	    and period is the period between updates (in hours),
-	    a period of zero means the file is only loaded once on startup,
-	    and url is the url of the file to download.
-	    IMPORTANT: Put the URL and the kind between quotes.
-	    EXAMPLE:
-	 web_infos = [
-	  ("server.met", 0, "http://www.jd2k.com/server.met");
-	  ("guarding.p2p", 96, "http://www.bluetack.co.uk/config/level1.gz");
-	  ("ocl", 24, "http://members.lycos.co.uk/appbyhp2/FlockHelpApp/contact-files/contact.ocl");
-	  ("contact.dat", 168, "http://download.overnet.org/contact.dat");
-	 ]
+	  the format: (kind, period, url), where kind is either
+	  'server.met' for a server.met file (also in gz/bz2/zip format)
+	               containing ed2k server, or
+	  'comments.met' for a file of comments, or
+	  'guarding.p2p' for a blocklist file (also in gz/bz2/zip format), or
+	  'ocl' for file in the ocl format containing overnet peers, or
+	  'contact.dat' for an contact.dat file containing overnet peers,
+	  'nodes.gzip' for a fasttrack nodes.gzip,
+	  and period is the period between updates (in hours),
+	  a period of zero means the file is only loaded once on startup,
+	  and url is the url of the file to download.
+	  IMPORTANT: Put the URL and the kind between quotes.
+	  EXAMPLE:
+	    web_infos = [
+	    ("server.met", 0, "http://www.gruk.org/server.met.gz");
+	    ("hublist", 0, "http://dchublist.com/hublist.config.bz2");
+	    ("guarding.p2p", 96, "http://www.bluetack.co.uk/config/level1.gz");
+	    ("ocl", 24, "http://members.lycos.co.uk/appbyhp2/FlockHelpApp/contact-files/contact.ocl");
+	    ("contact.dat", 168, "http://download.overnet.org/contact.dat");
+	    ("geoip.dat", 168, "http://www.maxmind.com/download/geoip/database/GeoIP.dat.gz");
+	    ]
 	   *)
  web_infos = [
-  ("guarding.p2p", 96, "http://www.bluetack.co.uk/config/level1.gz");
-  ("server.met", 0, "http://www.jd2k.com/server.met");
   ("contact.dat", 168, "http://download.overnet.org/contact.dat");
   ("geoip.dat", 0, "http://www.maxmind.com/download/geoip/database/GeoIP.dat.gz");
+  ("server.met", 0, "http://www.gruk.org/server.met.gz");
+  ("guarding.p2p", 96, "http://www.bluetack.co.uk/config/level1.gz");
+  (hublist, 0, "http://dchublist.com/hublist.config.bz2");
   ("nodes.gzip", 0, "http://update.kceasy.com/update/fasttrack/nodes.gzip");]
 
 	(* Cookies send with a http request (used for .torrent files and web_infos) *)
@@ -221,7 +244,7 @@
  html_mods_bw_refresh_delay = 11
 
 	(* html_mods_theme to use (located in relative html_themes/<theme_name> directory
-	     leave blank to use internal theme *)
+	  leave blank to use internal theme *)
  html_mods_theme = ""
 
 
@@ -233,39 +256,40 @@
 
 
 	(* Set to false if you don't want mldonkey to automatically put completed files
-	   in incoming directory *)
+	  in incoming directory *)
  auto_commit = true
 
 	(* Set to true if you want all new downloads be paused immediatly
-	     will be set to false on core start. *)
+	  will be set to false on core start. *)
  pause_new_downloads = false
 
 	(* The maximal number of files in Downloading state (other ones are Queued) *)
  max_concurrent_downloads = 50
 
 	(* The maximal length of zero bytes between non-zero bytes in a file that
-	should be interpreted as downloaded during a recovery *)
+	  should be interpreted as downloaded during a recovery *)
  max_recover_zeroes_gap = 16
 
 	(* A command that is called when a file is committed, does not work on MinGW.
-	    Arguments are (kept for compatability):
-	      $1 - temp file name, without path
-	      $2 - file size
-	      $3 - filename of the committed file
-	    Also these environment variables can be used (prefered way):
-	      $TEMPNAME  - temp file name, including path
-	      $FILEID    - same as $1
-	      $FILESIZE  - same as $2
-	      $FILENAME  - same as $3
-	      $FILEHASH  - internal hash
-	      $DURATION  - download duration
-	      $INCOMING  - directory used for commit
-	      $NETWORK   - network used for downloading
-	      $ED2K_HASH - ed2k hash if MD4 is known *)
+	  Arguments are (kept for compatability):
+	    $1 - temp file name, without path
+	    $2 - file size
+	    $3 - filename of the committed file
+	  Also these environment variables can be used (prefered way):
+	    $TEMPNAME  - temp file name, including path
+	    $FILEID    - same as $1
+	    $FILESIZE  - same as $2
+	    $FILENAME  - same as $3
+	    $FILEHASH  - internal hash
+	    $DURATION  - download duration
+	    $INCOMING  - directory used for commit
+	    $NETWORK   - network used for downloading
+	    $ED2K_HASH - ed2k hash if MD4 is known
+	   *)
  file_completed_cmd = ""
 
 	(* The command which is called when a download is started. Arguments
-	are '-file <num>' *)
+	  are '-file <num>' *)
  file_started_cmd = ""
 
 
@@ -278,13 +302,15 @@
 
 	(* The login of the user you want mldonkey to run as, after the ports
 	  have been bound (can be use not to run with root priviledges when
-	a port < 1024 is needed) *)
- run_as_user = ""
+	  a port < 1024 is needed) *)
+	(* changing this option requires restart of MLDonkey core *)
+ run_as_user = mldonkey
 
 	(* The UID of the user (0=disabled) you want mldonkey to run as, after the ports
 	  have been bound (can be use not to run with root priviledges when
-	a port < 1024 is needed) *)
- run_as_useruid = 0
+	  a port < 1024 is needed) *)
+	(* changing this option requires restart of MLDonkey core *)
+ run_as_useruid = 113
 
 	(* Ask for GUI start *)
  ask_for_gui = false
@@ -332,8 +358,17 @@
 	(* The directory where temporary files should be put *)
  temp_directory = "/var/log/mldonkey/temp"
 
-	(* New directories in incoming_directories are created with these rights *)
- create_dir_mask = 755
+	(* How often (in minutes) should MLDonkey scan all shared directories for new/removed files.
+	  0 to disable scanning of shared directories. Use command reshare to manually scan shares.
+	  When core starts all shared directories are scanned once, independent of this option. *)
+	(* changing this option requires restart of MLDonkey core *)
+ share_scan_interval = 1
+
+	(* New download files are created with these rights (in octal) *)
+ create_file_mode = 664
+
+	(* New directories in incoming_directories are created with these rights (in octal) *)
+ create_dir_mode = 755
 
 	(* Create new files as sparse, only valid on MinGW for files on NTFS drives *)
  create_file_sparse = true
@@ -342,14 +377,14 @@
  hdd_temp_minfree = 50
 
 	(* If true core shuts down when free space on temp dir is below hdd_temp_minfree,
-	    otherwise all downloads are paused and a warning email is sent. *)
+	  otherwise all downloads are paused and a warning email is sent. *)
  hdd_temp_stop_core = false
 
 	(* Mininum free space in MB on core directory, minimum 20 *)
  hdd_coredir_minfree = 50
 
 	(* If true core shuts down when free space on core dir is below hdd_coredir_minfree,
-	    otherwise all downloads are paused and a warning email is sent. *)
+	  otherwise all downloads are paused and a warning email is sent. *)
  hdd_coredir_stop_core = true
 
 	(* Send a warning mail each <interval> hours for each directory, 0 to deactivate mail warnings. *)
@@ -364,17 +399,15 @@
 	   Finished BT multifile downloads are committed to the first directory
 	   with strategy incoming_directories. Other downloads are committed
 	   to the first directory with the strategy incoming_files.
-	   If more than one directory has one of the incoming_* strategies
-	   it will be ignored on commit, but they are shared nonetheless.
+	   MLdonkey searches all shared_directories with incoming_* strategies
+	   on commit and uses the first one with enough free diskspace.
 	   Other strategies can be found in searches.ini, section customized_sharing. *)
  shared_directories = [
   {     dirname = "/var/log/mldonkey/incoming/files"
-     networks = []
      strategy = incoming_files
      priority = 0
 };
   {     dirname = "/var/log/mldonkey/incoming/directories"
-     networks = []
      strategy = incoming_directories
      priority = 0
 };]
@@ -388,23 +421,23 @@
 
 
 	(* Commands that you are allowed to be call from the interface. These
-	commands should short, so that the core is not blocked more than necessary. *)
+	  commands should short, so that the core is not blocked more than necessary. *)
  allowed_commands = [
   (df, df);
   (ls, "ls incoming");]
 
 	(* Allow you to use any command with ! in the interface instead of only the
-	ones in allowed_commands *)
+	  ones in allowed_commands *)
  allow_any_command = false
 
-	(* Are all users allowed to change MLDonkey options? *)
- enable_user_config = true
-
 	(* Allow others to browse our share list (0: none, 1: friends only, 2: everyone *)
  allow_browse_share = 1
 
 	(* Regexp of messages to filter out, example: string1|string2|string3 *)
- messages_filter = "Your client is connecting too fast"
+ messages_filter = "DI-Emule|ZamBoR|Ketamine|eMule FX|AUTOMATED MESSAGE"
+
+	(* Regexp of comments to filter out, example: string1|string2|string3 *)
+ comments_filter = "http://|https://|www\\."
 
 
     (************************************)
@@ -417,9 +450,6 @@
 	(* (experimental) *)
  save_results = 0
 
-	(* filters on replies (replies will be kept). *)
- filters = ""
-
 	(* Buffer writes and flush after buffer_writes_delay seconds (experimental) *)
  buffer_writes = false
 
@@ -443,6 +473,7 @@
  shutdown_timeout = 3
 
 	(* The IP address used to bind the p2p clients *)
+	(* changing this option requires restart of MLDonkey core *)
  client_bind_addr = "0.0.0.0"
 
 
@@ -468,12 +499,15 @@
 
 
 	(* The IP address used to bind the http server *)
+	(* changing this option requires restart of MLDonkey core *)
  http_bind_addr = "0.0.0.0"
 
 	(* The IP address used to bind the gui server *)
+	(* changing this option requires restart of MLDonkey core *)
  gui_bind_addr = "0.0.0.0"
 
 	(* The IP address used to bind the telnet server *)
+	(* changing this option requires restart of MLDonkey core *)
  telnet_bind_addr = "0.0.0.0"
 
 	(* Should *all* sources for a file be shown on HTML/telnet vd <num> *)
@@ -507,23 +541,24 @@
 	  swarming : debug swarming
 	  hc : http_client messages
 	  hs : http_server messages
+	  com : commands by non-admin users
 	  act : debug activity
 	  bw : debug bandwidth
-	  unexp : debug unexpected messages
-	 *)
+	  geo : debug GeoIP
+	  unexp : debug unexpected messages *)
  verbosity = ""
 
 
     (************************************)
     (* SECTION : Bandwidth FOR EXPERTS *)
-    (*  *)
+    (* Bandwidth options *)
     (************************************)
 
 
 
 	(* The delay in milliseconds to wait in the event loop. Can be decreased to
-	increase the bandwidth usage, or increased to lower the CPU usage. *)
- loop_delay = 20
+	  increase the bandwidth usage, or increased to lower the CPU usage. *)
+ loop_delay = 5
 
 
     (************************************)
@@ -547,6 +582,9 @@
 	(* URLs of RSS feeds *)
  rss_feeds = []
 
+	(* If MLDonkey can not read broken RSS feeds, use this program to preprocess them *)
+ rss_preprocessor = xmllint
+
 	(* Keep IP blocking ranges descriptions in memory *)
  ip_blocking_descriptions = false
 
@@ -567,17 +605,14 @@
  geoip_dat = ""
 
 	(* The size of the header of a TCP/IP packet on your connection (ppp adds
-	    14 bytes sometimes, so modify to take that into account) *)
+	  14 bytes sometimes, so modify to take that into account) *)
  tcpip_packet_size = 40
 
 	(* The size of the MTU of a TCP/IP packet on your connection *)
  mtu_packet_size = 1500
 
-	(* The size of the frame packet on your network (on my cable link, it is 250) *)
- packet_frame_size = 250
-
 	(* The size of the minimal packet you want mldonkey to send when data is
-	available on the connection *)
+	  available on the connection *)
  minimal_packet_size = 600
 
 	(* Should a connection check if the peer we are connected to is still alive?
@@ -607,12 +642,24 @@
 	(* Whether to display the Net column in vd output *)
  html_mods_vd_network = true
 
+	(* Whether to display the Comments column in vd output *)
+ html_mods_vd_comments = true
+
+	(* Whether to display the User column in vd output *)
+ html_mods_vd_user = false
+
+	(* Whether to display the Group column in vd output *)
+ html_mods_vd_group = false
+
 	(* Whether to display the Active Sources column in vd output *)
  html_mods_vd_active_sources = true
 
 	(* Whether to display the Age column in vd output *)
  html_mods_vd_age = true
 
+	(* Whether to display flags instead of country codes *)
+ html_flags = true
+
 	(* Show graph in vd output *)
  html_mods_vd_gfx = true
 
@@ -643,12 +690,26 @@
 	(* Show hourly graph in vd output *)
  html_mods_vd_gfx_h = true
 
-	(* Graph x size in vd output ( 320 < x < 3600 ) *)
+	(* Graph x size in vd output ( 365 < x < 3665 ) *)
  html_mods_vd_gfx_x_size = 630
 
 	(* Graph y size in vd output ( 200 < y < 1200 ) *)
  html_mods_vd_gfx_y_size = 200
 
+	(* compute values for hourly graph every 1,2,3,4,5,10,15,20,30,60 min
+		Changes to this option require a core restart. *)
+	(* changing this option requires restart of MLDonkey core *)
+ html_mods_vd_gfx_h_intervall = 60
+
+	(* Dynamic grid width, start with 1 h/grid, maximum html_mods_vd_gfx_h_grid_time h/grid *)
+ html_mods_vd_gfx_h_dymamic = true
+
+	(* Max hours on time scale per grid (0 = no limit) *)
+ html_mods_vd_gfx_h_grid_time = 0
+
+	(* Number of shown subgrids on graph (0 = no subgrids) *)
+ html_mods_vd_gfx_subgrid = 0
+
 	(* Draw tag graph *)
  html_mods_vd_gfx_tag = false
 
@@ -667,23 +728,22 @@
 	(* Tag graph title *)
  html_mods_vd_gfx_tag_title = "MLNet traffic"
 
-	(* Tag graph title x pos in vd output
-	     *)
+	(* Tag graph title x pos in vd output *)
  html_mods_vd_gfx_tag_title_x_pos = 4
 
-	(* Tag graph title y pos in vd output  *)
+	(* Tag graph title y pos in vd output *)
  html_mods_vd_gfx_tag_title_y_pos = 1
 
-	(* Tag graph download x pos in vd output  *)
+	(* Tag graph download x pos in vd output *)
  html_mods_vd_gfx_tag_dl_x_pos = 4
 
-	(* Tag graph download y pos in vd output  *)
+	(* Tag graph download y pos in vd output *)
  html_mods_vd_gfx_tag_dl_y_pos = 17
 
-	(* Tag graph upload x pos in vd output  *)
+	(* Tag graph upload x pos in vd output *)
  html_mods_vd_gfx_tag_ul_x_pos = 4
 
-	(* Tag graph upload y pos in vd output  *)
+	(* Tag graph upload y pos in vd output *)
  html_mods_vd_gfx_tag_ul_y_pos = 33
 
 	(* Tag graph x size in vd output ( 130 < x < 3600 ) *)
@@ -698,9 +758,6 @@
 	(* Whether to display the Priority column in vd output *)
  html_mods_vd_prio = true
 
-	(* Whether to display the Queues in vd # output *)
- html_mods_vd_queues = true
-
 	(* Change height of download indicator bar in vd output *)
  html_vd_barheight = 2
 
@@ -752,21 +809,27 @@
 
 
 	(* If this option is set, IP addresses on the local network are allowed
-	(only for debugging) *)
+	  (only for debugging) *)
  allow_local_network = false
 
 	(* size of log in number of records *)
  log_size = 300
 
-	(* Maximum size of log_file in MB *)
+	(* Maximum size of log_file in MB, this value is only checked on startup,
+	   log_file will be deleted if its bigger than log_file_size. *)
  log_file_size = 2
 
 	(* The file in which you want mldonkey to log its debug messages. If you
 	  set this option, mldonkey will log this info in the file until you use the
-	'close_log' command. The log file may become very large. You can
-	    also enable logging in a file after startup using the 'log_file' command. *)
+	  'close_log' command. The log file may become very large. You can
+	  also enable logging in a file after startup using the 'log_file' command. *)
  log_file = "mlnet.log"
 
+	(* Post log messages to syslog. This setting is independent of log_file
+	  and its associated commands, therefore close_log does not stop log to syslog.
+	  Its therefore possible to log to syslog and log_file at the same time. *)
+ log_to_syslog = false
+
 	(* number of lines for GUI console messages *)
  gui_log_size = 30
 
@@ -778,17 +841,9 @@
 
 
 
-	(* Set to true if you want MLdonkey to emulate sparse files on your disk.
-	  Files will use less space, but <preview> and <recover> won't work anymore.
-	  Works only on Edonkey plugin. EXPERIMENTAL. *)
- emulate_sparsefiles = false
-
 	(* How many sources to use to download each chunk *)
  sources_per_chunk = 3
 
-	(* What algorithm to use to select blocks (currently 1 or 2) *)
- swarming_block_selection_algorithm = 1
-
 
     (************************************)
     (* SECTION : Startup FOR EXPERTS *)
@@ -798,6 +853,7 @@
 
 
 	(* How many megabytes should MLdonkey keep for saving configuration files. *)
+	(* changing this option requires restart of MLDonkey core *)
  config_files_security_space = 10
 
 
@@ -809,7 +865,7 @@
 
 
 	(* Name of program used for preview (first arg is local filename, second arg
-	    is name of file as searched on eDonkey *)
+	  is name of file as searched on eDonkey *)
  previewer = mldonkey_previewer
 
 	(* Directory where mldonkey binaries are installed *)
@@ -819,32 +875,6 @@
  mldonkey_gui = "./mlgui"
 
 
-    (************************************)
-    (* SECTION : MLChat FOR EXPERTS *)
-    (* MLChat options *)
-    (************************************)
-
-
-
-	(* port of the external chat application *)
- chat_app_port = 5036
-
-	(* hostname of the external chat application *)
- chat_app_host = localhost
-
-	(* port used by the external chat application to use the core as a proxy *)
- chat_port = 4002
-
-	(* The IP address used to bind the chat server *)
- chat_bind_addr = "0.0.0.0"
-
-	(* the id to use for communicating with the core console through chat interface *)
- chat_console_id = "donkey console"
-
-	(* use the chat to indicate when a file has been downloaded *)
- chat_warning_for_downloaded = true
-
-
     (************************************)
     (* SECTION : Other FOR EXPERTS *)
     (* Other options *)
@@ -852,10 +882,8 @@
 
 
 
-	(* keep seen files in history to allow local search (can be expensive in memory) *)
- use_file_history = false
-
 	(* Buffer writes and flush after buffer_writes_delay seconds (experimental) *)
+	(* changing this option requires restart of MLDonkey core *)
  buffer_writes_delay = 30.
 
 	(* Flush buffers if buffers exceed buffer_writes_threshold kB (experimental) *)
@@ -865,12 +893,15 @@
  utf8_filename_conversions = []
 
 	(* The size of the buffer between the client and its GUI. Can be useful
-	to increase when the connection between them has a small bandwith *)
+	  to increase when the connection between them has a small bandwith *)
  interface_buffer = 1000000
 
 	(* The size long names will be shortened to in the interface *)
  max_name_len = 50
 
+	(* The maximum number of different filenames used by MLDonkey *)
+ max_filenames = 50
+
 	(* The size long client names will be shortened to in the interface *)
  max_client_name_len = 25
 
@@ -883,33 +914,21 @@
 	(* The realm shown when connecting with a WEB browser *)
  http_realm = MLdonkey
 
-	(* This option controls whether the WEB interface should use frames or not *)
- use_html_frames = true
-
 	(* This option controls whether the WEB interface should show frame borders or not *)
  html_frame_border = true
 
 	(* The height of the command frame in pixel (depends on your screen and browser sizes) *)
  commands_frame_height = 46
 
+	(* Message printed at startup additional to welcome text *)
+ motd_html = ""
+
 	(* Force compaction every <n> hours (in [1..24]) *)
  compaction_delay = 2
 
 	(* The delay between reloads of the vd output in the WEB interface *)
  vd_reload_delay = 120
 
-	(* (experimental) *)
- dp500_pclink = false
-
-	(* (experimental) *)
- dp500_port = 8000
-
-	(* (experimental) *)
- dp500_buffer = 2000000
-
-	(* (experimental) *)
- dp500_directory = dp500
-
 	(* Should the MLSUBMIT.REG file be created *)
  create_mlsubmit = true
 
@@ -938,21 +957,24 @@
 	(* Minimal number of results for filter form to appear *)
  filter_table_threshold = 50
 
-	(* Maximal size of the buffers of a client *)
+	(* Maximal size in byte of the buffers of a client, minimum 50.000 byte.
+	For high-volume links raise this value to 1.000.000 or higher. *)
  client_buffer_size = 500000
 
 	(* The delay between two saves of the 'downloads.ini' file (default is 15 minutes).
-	    Changes to this option require a core restart. *)
+	  Changes to this option require a core restart. *)
+	(* changing this option requires restart of MLDonkey core *)
  save_options_delay = 900.
 
 	(* timeout when connecting to a server *)
  server_connection_timeout = 30.
 
 	(* The delay between one glance at a file and another *)
+	(* changing this option requires restart of MLDonkey core *)
  download_sample_rate = 1.
 
 	(* How many samples go into an estimate of transfer rates *)
- download_sample_size = 10
+ download_sample_size = 100
 
 	(* This option defines a set of date at which some commands have to be executed.
 	  For each tuple, the first argument is a list of week days (from 0 to 6),
@@ -965,14 +987,21 @@
  compaction_overhead = 25
 
 	(* The major GC speed is computed from this parameter. This is the memory
-	    that will be "wasted" because the GC does not immediatly collect 
-	    unreachable blocks. It is expressed as a percentage of the memory used
-	    for live data. The GC will work more (use more CPU time and collect 
-	    blocks more eagerly) if space_overhead is smaller. *)
+	  that will be "wasted" because the GC does not immediatly collect 
+	  unreachable blocks. It is expressed as a percentage of the memory used
+	  for live data. The GC will work more (use more CPU time and collect 
+	  blocks more eagerly) if space_overhead is smaller. *)
  space_overhead = 80
 
 	(* Maximal number of results displayed for a search *)
  max_displayed_results = 1000
 
 	(* (internal option) *)
- options_version = 13
+	(* Do not change this option, internal use only! *)
+ options_version = 18
+
+	(* Maximum number of comments per file *)
+ max_comments_per_file = 100
+
+	(* Maximum length of file comments *)
+ max_comment_length = 256
diff --git a/config/mldonkey/fileTP.ini b/config/mldonkey/fileTP.ini
index 3618b8ba1..9e4b3e0d4 100644
--- a/config/mldonkey/fileTP.ini
+++ b/config/mldonkey/fileTP.ini
@@ -23,6 +23,7 @@
  range_arg = range
 
 	(* (internal option) *)
+	(* Do not change this option, internal use only! *)
  options_version = 0
 
 	(* Chunk size (in bytes) (0 = No chunks) *)
diff --git a/config/mldonkey/file_sources.ini b/config/mldonkey/file_sources.ini
index c6cadc246..3f3e108fe 100644
--- a/config/mldonkey/file_sources.ini
+++ b/config/mldonkey/file_sources.ini
@@ -9,7 +9,7 @@
     (************************************)
 
 
- save_time = 153199884
+ save_time = 191427490
  sources = []
 
 (*
diff --git a/config/mldonkey/mldonkey_submit b/config/mldonkey/mldonkey_submit
index 72aba860c..275a5be56 100755
--- a/config/mldonkey/mldonkey_submit
+++ b/config/mldonkey/mldonkey_submit
@@ -10,7 +10,7 @@ use LWP::UserAgent;
 ($#ARGV >= 0) || die "Usage: mldonkey_submit <ed2kURI> ...
 ";
 
-$vars{'HTTPURL'} = "http://127.0.0.1:4080";
+$vars{'HTTPURL'} = "http://192.168.181.70:4080";
 $vars{'HTTPUSER'} = "admin";
 $vars{'HTTPPASS'} = "";
 
diff --git a/config/mldonkey/mlnet.log b/config/mldonkey/mlnet.log
deleted file mode 100644
index 93ec0dd33..000000000
--- a/config/mldonkey/mlnet.log
+++ /dev/null
@@ -1,18 +0,0 @@
-2006/07/18 05:18:03 Started logging...
-2006/07/18 05:18:03 [cCO] Options correctly saved
-2006/07/18 05:18:03 [dMain] Check http://www.mldonkey.net/ for updates
-2006/07/18 05:18:03 enabling networks: Donkey (loading sources ... completed) BitTorrent FileTP 
-2006/07/18 05:18:03 disabled networks: none
-2006/07/18 05:18:03 [eDThieves] Updating options to version 1
-2006/07/18 05:18:03 [dMain] To command: telnet 127.0.0.1 4000
-2006/07/18 05:18:03 [dMain] Or with browser: http://127.0.0.1:4080
-2006/07/18 05:18:03 [dMain] For a GUI check out http://sancho-gui.sourceforge.net
-2006/07/18 05:18:03 [dMain] Connect to IP 127.0.0.1, port 4001
-2006/07/18 05:18:03 [dMain] If you connect from a remote machine adjust allowed_ips
-2006/07/18 05:18:03 [cCO] Options correctly saved
-2006/07/18 05:18:03 [dMain] Core started
-2006/07/18 05:18:04 [dMain] Received SIGINT, stopping MLDonkey...
-2006/07/18 05:18:04 [cCO] Options correctly saved
-2006/07/18 05:18:04 [cCO] Sources correctly saved
-2006/07/18 05:18:04 [cCO] Options backup as .tar.gz correctly saved
-2006/07/18 05:18:04 [dMain] Core stopped
diff --git a/config/mldonkey/mlnet_strings.en_US.utf8 b/config/mldonkey/mlnet_strings.en_US.utf8
new file mode 100644
index 000000000..0a9e2e804
--- /dev/null
+++ b/config/mldonkey/mlnet_strings.en_US.utf8
@@ -0,0 +1,1012 @@
+(************************************)
+         module "GeoIp"
+(************************************)
+
+"%s database loaded" = "%s database loaded"
+
+(************************************)
+         module "CommonWeb"
+(************************************)
+
+"%s while loading %s" = "%s while loading %s"
+
+"request %s (%s)" = "request %s (%s)"
+
+(************************************)
+         module "DriverMain"
+(************************************)
+
+"Core stopped" = "Core stopped"
+
+"Received SIGTERM, stopping MLDonkey..." = "Received SIGTERM, stopping MLDonkey..."
+
+"Core started" = "Core started"
+
+"If you connect from a remote machine adjust allowed_ips" = "If you connect from a remote machine adjust allowed_ips"
+
+"Connect to IP %s, port %d" = "Connect to IP %s, port %d"
+
+"For a GUI check out http://sancho-gui.sourceforge.net" = "For a GUI check out http://sancho-gui.sourceforge.net"
+
+"Or with browser: http://%s:%d" = "Or with browser: http://%s:%d"
+
+"To command: telnet %s %d" = "To command: telnet %s %d"
+
+"%s " = "%s "
+
+"%s[dMain] disabled networks: " = "%s[dMain] disabled networks: "
+
+"---- enabling interfaces ----" = "---- enabling interfaces ----"
+
+"---- enabling %s ----" = "---- enabling %s ----"
+
+"enabling networks: " = "enabling networks: "
+
+"Check http://www.mldonkey.org for updates" = "Check http://www.mldonkey.org for updates"
+
+" : print version number and exit" = " : print version number and exit"
+
+" <filename> : check file format" = " <filename> : check file format"
+
+"<ip> : undocumented" = "<ip> : undocumented"
+
+" : display information on the implementations" = " : display information on the implementations"
+
+": keep output to stdout after startup" = ": keep output to stdout after startup"
+
+": keep output to stderr after startup" = ": keep output to stderr after startup"
+
+" : this argument was removed, core will exit" = " : this argument was removed, core will exit"
+
+" : find another port when one is already used" = " : find another port when one is already used"
+
+": directory for pid file" = ": directory for pid file"
+
+"\"<user> <pass>\" : create user/change password" = "\"<user> <pass>\" : create user/change password"
+
+"Libmagic file-type recognition database present" = "Libmagic file-type recognition database present"
+
+(************************************)
+         module "Ip"
+(************************************)
+
+"[DNS] Resolving [%s] ..." = "[DNS] Resolving [%s] ..."
+
+(************************************)
+         module "DriverCommands"
+(************************************)
+
+":\t\t\tfor debugging only" = ":\t\t\tfor debugging only"
+
+"<ip> :\t\t\tcheck whether an IP is blocked" = "<ip> :\t\t\tcheck whether an IP is blocked"
+
+":\t\t\t\tdisplay the list of blocked IP ranges that were hit" = ":\t\t\t\tdisplay the list of blocked IP ranges that were hit"
+
+":\t\t\t\tfor debugging only" = ":\t\t\t\tfor debugging only"
+
+":\t\t\t\tclose all files (use to free space on disk after remove)" = ":\t\t\t\tclose all files (use to free space on disk after remove)"
+
+"<bool> :\t\t\tuse poll instead of select" = "<bool> :\t\t\tuse poll instead of select"
+
+":\t\t\tclose all opened sockets" = ":\t\t\tclose all opened sockets"
+
+":\t\t\t\tprint memory stats [<verbosity #num>]" = ":\t\t\t\tprint memory stats [<verbosity #num>]"
+
+"<theme> :\t\t\tselect html_theme" = "<theme> :\t\t\tselect html_theme"
+
+":\t\t\t\t\tprint RSS feeds" = ":\t\t\t\t\tprint RSS feeds"
+
+":\t\t\tselect html_mods_style <#>" = ":\t\t\tselect html_mods_style <#>"
+
+":\t\t\t\ttoggle html_mods" = ":\t\t\t\ttoggle html_mods"
+
+":\t\t\t\tclear log_file" = ":\t\t\t\tclear log_file"
+
+":\t\t\t\tclose logging to file" = ":\t\t\t\tclose logging to file"
+
+":\t\t\t\tenable logging to file" = ":\t\t\t\tenable logging to file"
+
+"<num1> <num2> :\t\t\ttry to swarm downloads from file <num2> (secondary) to file <num1> (primary)" = "<num1> <num2> :\t\t\ttry to swarm downloads from file <num2> (secondary) to file <num1> (primary)"
+
+":\t\t\t\tclear the table of clients being debugged" = ":\t\t\t\tclear the table of clients being debugged"
+
+"<client nums> :\t\tdebug file state" = "<client nums> :\t\tdebug file state"
+
+"<client nums> :\t\tdebug message in communications with these clients" = "<client nums> :\t\tdebug message in communications with these clients"
+
+"<true|false> :\t\t\treactivate log to stdout" = "<true|false> :\t\t\treactivate log to stdout"
+
+"<width> <height> :\t\t\tset terminal width and height (devel)" = "<width> <height> :\t\t\tset terminal width and height (devel)"
+
+":\t\t\t\t\ttoggle ansi terminal (devel)" = ":\t\t\t\t\ttoggle ansi terminal (devel)"
+
+":\t\t\t\t\tdump current log state to console" = ":\t\t\t\t\tdump current log state to console"
+
+":\t\t\treload messages file" = ":\t\t\treload messages file"
+
+"<user> <num> :\t\t\tchange owner of download <num> to <user>" = "<user> <num> :\t\t\tchange owner of download <num> to <user>"
+
+"<group> <num> :\t\t\tchange group of download <num> to <group>, use group = none for private file" = "<group> <num> :\t\t\tchange group of download <num> to <group>, use group = none for private file"
+
+":\t\t\t\tprint default group of logged-in user" = ":\t\t\t\tprint default group of logged-in user"
+
+":\t\t\t\tprint groups of logged-in user" = ":\t\t\t\tprint groups of logged-in user"
+
+":\t\t\t\tprint logged-in user name" = ":\t\t\t\tprint logged-in user name"
+
+":\t\t\t\t\tprint users" = ":\t\t\t\t\tprint users"
+
+"<group> <true|false> :\tchange group admin status" = "<group> <true|false> :\tchange group admin status"
+
+"<group> :\t\t\tremove an unused mldonkey group" = "<group> :\t\t\tremove an unused mldonkey group"
+
+"<group> <admin: true|false> :\tadd new mldonkey group" = "<group> <admin: true|false> :\tadd new mldonkey group"
+
+"<user> <dir> :\t\tchange user specific commit directory" = "<user> <dir> :\t\tchange user specific commit directory"
+
+"<user> <num> :\t\t\tchange number of allowed concurrent downloads" = "<user> <num> :\t\t\tchange number of allowed concurrent downloads"
+
+"<user> <mail> :\t\tchange user mail address" = "<user> <mail> :\t\tchange user mail address"
+
+"<passwd> :\t\t\tchange own password" = "<passwd> :\t\t\tchange own password"
+
+"<user> <group|None> :\tchange user default group" = "<user> <group|None> :\tchange user default group"
+
+"<user> <group> :\t\tremove a group from a mldonkey user" = "<user> <group> :\t\tremove a group from a mldonkey user"
+
+"<user> <group> :\t\tadd a group to a mldonkey user" = "<user> <group> :\t\tadd a group to a mldonkey user"
+
+"<user> :\t\t\tremove a mldonkey user" = "<user> :\t\t\tremove a mldonkey user"
+
+"<user> <passwd> [<group>] [<commit_dir>] [<mail>] [<max_downloads>]: add new mldonkey user/change user password" = "<user> <passwd> [<group>] [<commit_dir>] [<mail>] [<max_downloads>]: add new mldonkey user/change user password"
+
+"<file> :\t\t\tdownload all the links contained in the file" = "<file> :\t\t\tdownload all the links contained in the file"
+
+"<link> :\t\t\t\tdownload ed2k, sig2dat, torrent or other link" = "<link> :\t\t\t\tdownload ed2k, sig2dat, torrent or other link"
+
+":\t\t\ttell which files have several very different names" = ":\t\t\ttell which files have several very different names"
+
+"<num> \"<new name>\" :\t\tchange name of download <num> to <new name>" = "<num> \"<new name>\" :\t\tchange name of download <num> to <new name>"
+
+"<file number> :\t\t\tstart previewer for file <file number>" = "<file number> :\t\t\tstart previewer for file <file number>"
+
+"[<num>|queued|paused|downloading] :\t$bview file info for download <num>, or lists of queued, paused or downloading files, or all downloads if no argument given$n" = "[<num>|queued|paused|downloading] :\t$bview file info for download <num>, or lists of queued, paused or downloading files, or all downloads if no argument given$n"
+
+":\t\t\t\t$bmove downloaded files to incoming directory$n" = ":\t\t\t\t$bmove downloaded files to incoming directory$n"
+
+"<num> :\t\t\t\tchange release state of a download" = "<num> :\t\t\t\tchange release state of a download"
+
+"<num|all> :\t\t\tresume a paused download (use arg 'all' for all files)" = "<num|all> :\t\t\tresume a paused download (use arg 'all' for all files)"
+
+"<num|all> :\t\t\tpause a download (use arg 'all' for all files)" = "<num|all> :\t\t\tpause a download (use arg 'all' for all files)"
+
+"<num> :\t\t\tverify chunks of file <num>" = "<num> :\t\t\tverify chunks of file <num>"
+
+":\t\t\t\tdisplay downloaders list" = ":\t\t\t\tdisplay downloaders list"
+
+"<num|all> :\t\t\tcancel download (use arg 'all' for all files)" = "<num|all> :\t\t\tcancel download (use arg 'all' for all files)"
+
+"<num> :\t\t\tprint the segments downloaded in file" = "<num> :\t\t\tprint the segments downloaded in file"
+
+"<yes|no|what> :\t\t\tconfirm cancellation" = "<yes|no|what> :\t\t\tconfirm cancellation"
+
+"<file number> <random|linear> :\tchange download order of file blocks (default random, with first and last block first)" = "<file number> <random|linear> :\tchange download order of file blocks (default random, with first and last block first)"
+
+"<priority> <files numbers> :\tchange file priorities" = "<priority> <files numbers> :\tchange file priorities"
+
+":\t\t\t\tshow users currently uploading" = ":\t\t\t\tshow users currently uploading"
+
+"[downloading|shared|empty for all]: list links of shared files" = "[downloading|shared|empty for all]: list links of shared files"
+
+":\t\t\t\tstatistics on upload" = ":\t\t\t\tstatistics on upload"
+
+"<dir> :\t\t\t\tunshare directory <dir>" = "<dir> :\t\t\t\tunshare directory <dir>"
+
+"<priority> <dir> [<strategy>] :\tshare directory <dir> with <priority> [and sharing strategy <strategy>]" = "<priority> <dir> [<strategy>] :\tshare directory <dir> with <priority> [and sharing strategy <strategy>]"
+
+":\t\t\t\tprint shared directories" = ":\t\t\t\tprint shared directories"
+
+"debug command" = "debug command"
+
+"debug command (example: file .)" = "debug command (example: file .)"
+
+"debug command (example: disk .)" = "debug command (example: disk .)"
+
+":\t\t\t\tcheck shared files for removal" = ":\t\t\t\tcheck shared files for removal"
+
+":\t\t\t\t$bprint options values by section$n" = ":\t\t\t\t$bprint options values by section$n"
+
+":\t\t\t\t\tprint web_infos options" = ":\t\t\t\t\tprint web_infos options"
+
+"[<option>|changed]:\t\t\tprint options (use * as wildcard), 'changed' prints all changed options, leave empty to print all options" = "[<option>|changed]:\t\t\tprint options (use * as wildcard), 'changed' prints all changed options, leave empty to print all options"
+
+":\t\t\t\t\t$bdisplay options$n" = ":\t\t\t\t\t$bdisplay options$n"
+
+"[<options|sources|backup>] :\tsave options and/or sources or backup (empty for options and sources)" = "[<options|sources|backup>] :\tsave options and/or sources or backup (empty for options and sources)"
+
+"<option_name> <option_value> :\t$bchange option value$n" = "<option_name> <option_value> :\t$bchange option value$n"
+
+":\t\t\tforce download of an already downloaded file" = ":\t\t\tforce download of an already downloaded file"
+
+"<num> :\t\t\t\t$bfile to download$n" = "<num> :\t\t\t\t$bfile to download$n"
+
+":\t\t\tview custom queries" = ":\t\t\tview custom queries"
+
+":\t\t\t\t\tview all queries" = ":\t\t\t\t\tview all queries"
+
+"<query> :\t\t\t\tsearch for files locally\n\n\tWith special args:\n\t-network <netname>\n\t-minsize <size>\n\t-maxsize <size>\n\t-media <Video|Audio|...>\n\t-Video\n\t-Audio\n\t-format <format>\n\t-title <word in title>\n\t-album <word in album>\n\t-artist <word in artist>\n\t-field <field> <fieldvalue>\n\t-not <word>\n\t-and <word>\n\t-or <word>\n" = "<query> :\t\t\t\tsearch for files locally\n\n\tWith special args:\n\t-network <netname>\n\t-minsize <size>\n\t-maxsize <size>\n\t-media <Video|Audio|...>\n\t-Video\n\t-Audio\n\t-format <format>\n\t-title <word in title>\n\t-album <word in album>\n\t-artist <word in artist>\n\t-field <field> <fieldvalue>\n\t-not <word>\n\t-and <word>\n\t-or <word>\n"
+
+"<query> :\t\t\t\t$bsearch for files on all networks$n\n\n\tWith special args:\n\t-network <netname>\n\t-minsize <size>\n\t-maxsize <size>\n\t-media <Video|Audio|...>\n\t-Video\n\t-Audio\n\t-format <format>\n\t-title <word in title>\n\t-album <word in album>\n\t-artist <word in artist>\n\t-field <field> <fieldvalue>\n\t-not <word>\n\t-and <word>\n\t-or <word>\n" = "<query> :\t\t\t\t$bsearch for files on all networks$n\n\n\tWith special args:\n\t-network <netname>\n\t-minsize <size>\n\t-maxsize <size>\n\t-media <Video|Audio|...>\n\t-Video\n\t-Audio\n\t-format <format>\n\t-title <word in title>\n\t-album <word in album>\n\t-artist <word in artist>\n\t-field <field> <fieldvalue>\n\t-not <word>\n\t-and <word>\n\t-or <word>\n"
+
+"[<num>] :\t\t\t\t$bview results of a search$n" = "[<num>] :\t\t\t\t$bview results of a search$n"
+
+"<num1> <num2> ... :\t\tforget searches <num1> <num2> ..." = "<num1> <num2> ... :\t\tforget searches <num1> <num2> ..."
+
+":\t\t\t\tprint network porttest results" = ":\t\t\t\tprint network porttest results"
+
+":\t\t\tforce start network porttest" = ":\t\t\tforce start network porttest"
+
+":\t\t\t\tstart IP discovery" = ":\t\t\t\tstart IP discovery"
+
+"<num> :\t\t\t\tdisable a particular network" = "<num> :\t\t\t\tdisable a particular network"
+
+"<num> :\t\t\t\tenable a particular network" = "<num> :\t\t\t\tenable a particular network"
+
+":\t\t\t\tprint all networks" = ":\t\t\t\tprint all networks"
+
+"<cmd> :\t\t\t\tstart command <cmd>\n\t\t\t\t\tmust be allowed in 'allowed_commands' option or by 'allow_any_command' if arguments" = "<cmd> :\t\t\t\tstart command <cmd>\n\t\t\t\t\tmust be allowed in 'allowed_commands' option or by 'allow_any_command' if arguments"
+
+":\t\t\t\tremove graphical transfer statistics files" = ":\t\t\t\tremove graphical transfer statistics files"
+
+":\t\t\t\tdisplay graphical transfer statistics" = ":\t\t\t\tdisplay graphical transfer statistics"
+
+":\t\t\t\t\tdisplay transfer statistics" = ":\t\t\t\t\tdisplay transfer statistics"
+
+":\t\t\t\treset country based transfer statistics and save statistics.ini" = ":\t\t\t\treset country based transfer statistics and save statistics.ini"
+
+":\t\t\t\tdisplay country database" = ":\t\t\t\tdisplay country database"
+
+"[<all|regex>]:\t\t\tdisplay country based transfer statistics for countries with data transfered,\n\t\t\t\t\tuse arg 'all' for all countries seen\n\t\t\t\t\tor * as wildcard for country name, code and continent" = "[<all|regex>]:\t\t\tdisplay country based transfer statistics for countries with data transfered,\n\t\t\t\t\tuse arg 'all' for all countries seen\n\t\t\t\t\tor * as wildcard for country name, code and continent"
+
+":\t\t\t\ttoggle between the two rate sets" = ":\t\t\t\ttoggle between the two rate sets"
+
+":\t\t\t\tprint current bandwidth stats" = ":\t\t\t\tprint current bandwidth stats"
+
+":\t\t\t\t\tview upload credits" = ":\t\t\t\t\tview upload credits"
+
+"<m> :\t\t\t\tdisable upload during <m> minutes, queue all files" = "<m> :\t\t\t\tdisable upload during <m> minutes, queue all files"
+
+"<client num> :\t\t\tprint files from friend <client num>" = "<client num> :\t\t\tprint files from friend <client num>"
+
+":\t\t\t\tdisplay all friends" = ":\t\t\t\tdisplay all friends"
+
+"<client numbers|all> :\tremove friend (use arg 'all' for all friends)" = "<client numbers|all> :\tremove friend (use arg 'all' for all friends)"
+
+"<client num> :\t\tadd client <client num> to friends" = "<client num> :\t\tadd client <client num> to friends"
+
+"<client num> :\t\t\task friend files" = "<client num> :\t\t\task friend files"
+
+":\t\t\t\t\tview friends" = ":\t\t\t\t\tview friends"
+
+"<server numbers|all> :\t\tdisconnect from server(s)" = "<server numbers|all> :\t\tdisconnect from server(s)"
+
+"[<num>] :\t\t\t\tconnect to more servers (or to server <num>)" = "[<num>] :\t\t\t\tconnect to more servers (or to server <num>)"
+
+"<num> :\t\t\tshow list of files published on server <num>" = "<num> :\t\t\tshow list of files published on server <num>"
+
+"<num> :\t\t\tprint banner of connected server <num>" = "<num> :\t\t\tprint banner of connected server <num>"
+
+"<server numbers|all|blocked|disc> :\tremove server(s) ('all'/'blocked'/'disc' = all/IP blocked/disconnected servers)" = "<server numbers|all|blocked|disc> :\tremove server(s) ('all'/'blocked'/'disc' = all/IP blocked/disconnected servers)"
+
+":\t\t\t\t\tlist all known servers" = ":\t\t\t\t\tlist all known servers"
+
+":\t\t\t\t\t$blist connected servers$n" = ":\t\t\t\t\t$blist connected servers$n"
+
+":\t\t\t\t\tprint calendar" = ":\t\t\t\t\tprint calendar"
+
+"<hour> \"<command>\" :\tadd a command to be executed every day" = "<hour> \"<command>\" :\tadd a command to be executed every day"
+
+"<client num> <msg> :\t\tsend a message to a client" = "<client num> <msg> :\t\tsend a message to a client"
+
+":\t\t\t\tmessage_log [refresh delay in seconds]" = ":\t\t\t\tmessage_log [refresh delay in seconds]"
+
+"<minutes> :\t\t\tprint activity in the last <minutes> minutes" = "<minutes> :\t\t\tprint activity in the last <minutes> minutes"
+
+":\t\t\t\tprint mldonkey disk information" = ":\t\t\t\tprint mldonkey disk information"
+
+":\t\t\t\tprint mldonkey port usage information" = ":\t\t\t\tprint mldonkey port usage information"
+
+":\t\t\t\tprint mldonkey runtime information" = ":\t\t\t\tprint mldonkey runtime information"
+
+":\t\t\t\tprint mldonkey core build information" = ":\t\t\t\tprint mldonkey core build information"
+
+":\t\t\t\tprint mldonkey core build, runtime and disk information" = ":\t\t\t\tprint mldonkey core build, runtime and disk information"
+
+":\t\t\t\tcore uptime" = ":\t\t\t\tcore uptime"
+
+":\t\t\t\tprint mldonkey version" = ":\t\t\t\tprint mldonkey version"
+
+"<num|all> :\t\t\t\tview client (use arg 'all' for all clients)" = "<num|all> :\t\t\t\tview client (use arg 'all' for all clients)"
+
+":\t\t\t\trecover lost files from temp directory" = ":\t\t\t\trecover lost files from temp directory"
+
+"[<list of kind|URL>] :\tre-download web_infos, leave empty to re-download all" = "[<list of kind|URL>] :\tre-download web_infos, leave empty to re-download all"
+
+"<url> :\t\t\tremove URL from web_infos" = "<url> :\t\t\tremove URL from web_infos"
+
+"<kind> <url> [<period>] :\tload this file from the web\n\t\t\t\t\tkind is either server.met (if the downloaded file is a server.met)\n\t\t\t\t\tperiod is the period between updates (in hours, default 0 = only loaded at startup)" = "<kind> <url> [<period>] :\tload this file from the web\n\t\t\t\t\tkind is either server.met (if the downloaded file is a server.met)\n\t\t\t\t\tperiod is the period between updates (in hours, default 0 = only loaded at startup)"
+
+":\t\t\t\t\t$bsave and kill the server$n" = ":\t\t\t\t\t$bsave and kill the server$n"
+
+":\t\t\t\t\t$bclose telnet$n" = ":\t\t\t\t\t$bclose telnet$n"
+
+":\t\t\t\t$bdelete a command alias\n\t\t\t\t\texample: \"unalias ca\"$n" = ":\t\t\t\t$bdelete a command alias\n\t\t\t\t\texample: \"unalias ca\"$n"
+
+":\t\t\t\t\t$badd a command alias\n\t\t\t\t\tfor example: \"alias ca cancel all\" makes an alias\n\t\t\t\t\t\"ca\" performing \"cancel all\"\n\t\t\t\t\tto substitute an alias just make a new one\n\t\t\t\t\tfor example: \"alias ca vd\"$n" = ":\t\t\t\t\t$badd a command alias\n\t\t\t\t\tfor example: \"alias ca cancel all\" makes an alias\n\t\t\t\t\t\"ca\" performing \"cancel all\"\n\t\t\t\t\tto substitute an alias just make a new one\n\t\t\t\t\tfor example: \"alias ca vd\"$n"
+
+":\t\t\t\tdump heap for debug" = ":\t\t\t\tdump heap for debug"
+
+(************************************)
+         module "BTInteractive"
+(************************************)
+
+"<filename> <comment> :\tgenerate the corresponding <filename> .torrent file with <comment> in torrents/tracked/.\n\t\t\t\t\tThe file is automatically tracked, and seeded if in incoming/" = "<filename> <comment> :\tgenerate the corresponding <filename> .torrent file with <comment> in torrents/tracked/.\n\t\t\t\t\tThe file is automatically tracked, and seeded if in incoming/"
+
+":\t\t\t\tprint all .torrent files on this server" = ":\t\t\t\tprint all .torrent files on this server"
+
+":\t\t\tprint all seeded .torrent files on this server" = ":\t\t\tprint all seeded .torrent files on this server"
+
+":\t\t\trecheck torrents/* directories for changes" = ":\t\t\trecheck torrents/* directories for changes"
+
+":\t\t\tremove all old .torrent files" = ":\t\t\tremove all old .torrent files"
+
+":\t\t\t\tstops all bittorrent downloads, use this if you want to make sure that the stop signal actually\n\t\t\t\t\tgets to the tracker when shutting mlnet down, but you have to wait till the stops get to the\n\t\t\t\t\ttracker and not wait too long, so mldonkey reconnects to the tracker :)" = ":\t\t\t\tstops all bittorrent downloads, use this if you want to make sure that the stop signal actually\n\t\t\t\t\tgets to the tracker when shutting mlnet down, but you have to wait till the stops get to the\n\t\t\t\t\ttracker and not wait too long, so mldonkey reconnects to the tracker :)"
+
+(************************************)
+         module "DonkeyInteractive"
+(************************************)
+
+"No forceable download found" = "No forceable download found"
+
+"File already downloaded (use 'force_download' if necessary)" = "File already downloaded (use 'force_download' if necessary)"
+
+(************************************)
+         module "CommonComplexOptions"
+(************************************)
+
+"Options backup as %s correctly saved" = "Options backup as %s correctly saved"
+
+"Sources correctly saved" = "Sources correctly saved"
+
+"Options correctly saved" = "Options correctly saved"
+
+(************************************)
+         module "CommonOptions"
+(************************************)
+
+"Logging in %s" = "Logging in %s"
+
+"List of IP addresses to use to boot Kademlia networks" = "List of IP addresses to use to boot Kademlia networks"
+
+"Set this option to false if you don't want to receive new Overnet peers" = "Set this option to false if you don't want to receive new Overnet peers"
+
+"The MD4 of the Overnet client" = "The MD4 of the Overnet client"
+
+"Interval (in seconds) before republish files" = "Interval (in seconds) before republish files"
+
+"allow extended search to search on overnet" = "allow extended search to search on overnet"
+
+"Size of the filename storage used to answer queries" = "Size of the filename storage used to answer queries"
+
+"port for Kademlia" = "port for Kademlia"
+
+"The files that were downloaded" = "The files that were downloaded"
+
+"port for overnet" = "port for overnet"
+
+"login of client on eDonkey network (nothing default to global one)" = "login of client on eDonkey network (nothing default to global one)"
+
+"maximum number of files published to servers per minute, eMule default 200" = "maximum number of files published to servers per minute, eMule default 200"
+
+"disconnect if server users is smaller" = "disconnect if server users is smaller"
+
+"Set the maximal rank of a client to be kept as a client" = "Set the maximal rank of a client to be kept as a client"
+
+"Set the number of hours you want client to remain banned" = "Set the number of hours you want client to remain banned"
+
+"true if you want your client IP to be set from servers ID" = "true if you want your client IP to be set from servers ID"
+
+"true if you want your client to ban\n  clients that try queue jumping (3 reconnections faster than 9 minutes)" = "true if you want your client to ban\n  clients that try queue jumping (3 reconnections faster than 9 minutes)"
+
+"true if you want your mldonkey to lose some\n  upload bandwidth sending messages to clients which are banned :)" = "true if you want your mldonkey to lose some\n  upload bandwidth sending messages to clients which are banned :)"
+
+"Are the downloaded files added to the old files list to prevent re-download ?" = "Are the downloaded files added to the old files list to prevent re-download ?"
+
+"Are the cancelled files added to the old files list to prevent re-download ?" = "Are the cancelled files added to the old files list to prevent re-download ?"
+
+"How often should we check all servers (minimum 4 hours, 0 to disable)" = "How often should we check all servers (minimum 4 hours, 0 to disable)"
+
+"Minimal number of servers remaining after remove_old_servers" = "Minimal number of servers remaining after remove_old_servers"
+
+"How often should remove old donkey servers (see max_server_age) be called\n  (in seconds, 0 to disable)" = "How often should remove old donkey servers (see max_server_age) be called\n  (in seconds, 0 to disable)"
+
+"max number of days after which an unconnected server is removed" = "max number of days after which an unconnected server is removed"
+
+"The weight of upload on a donkey connection compared to upload on other\n  peer-to-peer networks. Setting it to 5 for example means that a donkey\n  connection will be allowed to send 5 times more information per second than\n  an Open Napster connection. This is done to favorise donkey connections\n  over other networks, where upload is less efficient, without preventing\n  upload from these networks." = "The weight of upload on a donkey connection compared to upload on other\n  peer-to-peer networks. Setting it to 5 for example means that a donkey\n  connection will be allowed to send 5 times more information per second than\n  an Open Napster connection. This is done to favorise donkey connections\n  over other networks, where upload is less efficient, without preventing\n  upload from these networks."
+
+"How long can a silent server stay connected" = "How long can a silent server stay connected"
+
+"Uploaded zones (1 zone = 180 kBytes) needed to enable the dynamic upload lifetime" = "Uploaded zones (1 zone = 180 kBytes) needed to enable the dynamic upload lifetime"
+
+"Each client upload lifetime depends on download-upload ratio" = "Each client upload lifetime depends on download-upload ratio"
+
+"If true, each client is allowed to complete only one chunk, independent, if it is empty or\n   partial. this setting overrides upload_full_chunks and dynamic_upload_lifetime,\n   but is, as a failsafe, limited by upload_lifetime (should be set reasonable high)" = "If true, each client is allowed to complete only one chunk, independent, if it is empty or\n   partial. this setting overrides upload_full_chunks and dynamic_upload_lifetime,\n   but is, as a failsafe, limited by upload_lifetime (should be set reasonable high)"
+
+"If true, each client is allowed to receive one chunk, this setting overrides upload_lifetime" = "If true, each client is allowed to receive one chunk, this setting overrides upload_lifetime"
+
+"How long a downloading client can stay in my upload queue (in minutes >5)" = "How long a downloading client can stay in my upload queue (in minutes >5)"
+
+"How long can a silent client stay in the upload queue" = "How long can a silent client stay in the upload queue"
+
+"How long should we wait in the queue of another client" = "How long should we wait in the queue of another client"
+
+"A list of ports that specify servers to remove\n  from server list. Servers with ports on this list can't be added, and\n  will eventually be removed" = "A list of ports that specify servers to remove\n  from server list. Servers with ports on this list can't be added, and\n  will eventually be removed"
+
+"Enable secure user identification support" = "Enable secure user identification support"
+
+"The RSA private key of this client" = "The RSA private key of this client"
+
+"The MD4 of this client" = "The MD4 of this client"
+
+"Save sources to file_sources.ini and reload them on core start." = "Save sources to file_sources.ini and reload them on core start."
+
+"Maximal number of sources for each file" = "Maximal number of sources for each file"
+
+"Allow mldonkey to propagate your sources to other mldonkey clients.\n   This function is superseeded by eMule-style source exchange,\n   this option is outdated" = "Allow mldonkey to propagate your sources to other mldonkey clients.\n   This function is superseeded by eMule-style source exchange,\n   this option is outdated"
+
+"The maximal delay a connection with a server should last when walking through the list" = "The maximal delay a connection with a server should last when walking through the list"
+
+"Number of servers that can be used to walk\n  between servers" = "Number of servers that can be used to walk\n  between servers"
+
+"only servers which are set to 'preferred' will be connected, \n  please note that any server must be set to preferred to use this feature" = "only servers which are set to 'preferred' will be connected, \n  please note that any server must be set to preferred to use this feature"
+
+"Set this option to false if you don't want mldonkey\n  to change the master servers it is connected to" = "Set this option to false if you don't want mldonkey\n  to change the master servers it is connected to"
+
+"Set this option to false if you don't want to\n  receive new servers from clients" = "Set this option to false if you don't want to\n  receive new servers from clients"
+
+"Set this option to false if you don't want to\n  receive new servers from server.met" = "Set this option to false if you don't want to\n  receive new servers from server.met"
+
+"Set this option to false if you don't want to\n  receive new servers from servers" = "Set this option to false if you don't want to\n  receive new servers from servers"
+
+"send all clients your IP regardless of what ID was assigned by the server" = "send all clients your IP regardless of what ID was assigned by the server"
+
+"immediately close connection to servers that don't grant a High ID" = "immediately close connection to servers that don't grant a High ID"
+
+"A list of server IP to remove from server list. Can contain single IPs, CIDR ranges, or begin-end ranges.\n  Servers on this list can't be added, and will eventually be removed" = "A list of server IP to remove from server list. Can contain single IPs, CIDR ranges, or begin-end ranges.\n  Servers on this list can't be added, and will eventually be removed"
+
+"Should mldonkey try to detect sources masquerading as others and ban them" = "Should mldonkey try to detect sources masquerading as others and ban them"
+
+"Should mldonkey try to detect sources responsible for corruption and ban them, currently disabled" = "Should mldonkey try to detect sources responsible for corruption and ban them, currently disabled"
+
+"The number of servers you want to stay connected to" = "The number of servers you want to stay connected to"
+
+"Timeout on client connections when not queued" = "Timeout on client connections when not queued"
+
+"Delay used to request file sources" = "Delay used to request file sources"
+
+"The port used for connection by other donkey clients." = "The port used for connection by other donkey clients."
+
+"Max number of UDP packets per round for eXtended Search" = "Max number of UDP packets per round for eXtended Search"
+
+"Let you define a default comment for creating torrents" = "Let you define a default comment for creating torrents"
+
+"Let you define a default tracker for creating torrents (leave empty for mlnet tracker)" = "Let you define a default tracker for creating torrents (leave empty for mlnet tracker)"
+
+"The tracker will check the client key to update ip if changed" = "The tracker will check the client key to update ip if changed"
+
+"The tracker will check the torrent file is available if an announce request is received" = "The tracker will check the torrent file is available if an announce request is received"
+
+"The maximal number of peers returned by the tracker" = "The maximal number of peers returned by the tracker"
+
+"The maximal number of tracked files (to prevend saturation attack)" = "The maximal number of tracked files (to prevend saturation attack)"
+
+"The port to bind the tracker to" = "The port to bind the tracker to"
+
+"The line speed sent in the MyINFO message\n     eg. Modem, Cable, DSL, Satellite, LAN(T1), LAN(T3)" = "The line speed sent in the MyINFO message\n     eg. Modem, Cable, DSL, Satellite, LAN(T1), LAN(T3)"
+
+"Maximal number of sources to single file" = "Maximal number of sources to single file"
+
+"Automatically find alternative sources, if file is unavailable. Also add sources\n     from searches automatically" = "Automatically find alternative sources, if file is unavailable. Also add sources\n     from searches automatically"
+
+"Is this client firewalled (use passive searches)" = "Is this client firewalled (use passive searches)"
+
+"How many seconds we wait a client to continue slot before closing and freeing the slot" = "How many seconds we wait a client to continue slot before closing and freeing the slot"
+
+"The maximum time in seconds we wait to continue pushing data to client in uploading" = "The maximum time in seconds we wait to continue pushing data to client in uploading"
+
+"The maximum time in seconds we wait data from client in downloading" = "The maximum time in seconds we wait data from client in downloading"
+
+"In initialization, the time in seconds we wait connection responses from client" = "In initialization, the time in seconds we wait connection responses from client"
+
+"Minimum time between automated file tth searches in minutes" = "Minimum time between automated file tth searches in minutes"
+
+"The time a search is active" = "The time a search is active"
+
+"Define here a list of address/passwords/nick triples for hubs in form:\n    [ (\"hubserver.ip.com\", \"nick1\", \"pass1\");\n     (\"somehub.somewhere.org\", \"nick2\", \"pass2\");\n     (\"11.22.333.444\", \"nick3\", \"pass3\");\n    ]" = "Define here a list of address/passwords/nick triples for hubs in form:\n    [ (\"hubserver.ip.com\", \"nick1\", \"pass1\");\n     (\"somehub.somewhere.org\", \"nick2\", \"pass2\");\n     (\"11.22.333.444\", \"nick3\", \"pass3\");\n    ]"
+
+"The URL from which the first server list is downloaded" = "The URL from which the first server list is downloaded"
+
+"Your login on DC (no spaces !!!)" = "Your login on DC (no spaces !!!)"
+
+"How many slots are open to other clients" = "How many slots are open to other clients"
+
+"The port to bind the client to" = "The port to bind the client to"
+
+"All the swarmers used" = "All the swarmers used"
+
+"                Incoming and shared directories.\n   At least two entries have to be present here, one with strategy\n   incoming_files and one with strategy incoming_directories.\n   Both entries can point to the same directory.\n   If one of the two strategies is missing, MLDonkey will create a default\n   directory with its entry here.\n   Finished BT multifile downloads are committed to the first directory\n   with strategy incoming_directories. Other downloads are committed\n   to the first directory with the strategy incoming_files.\n   MLdonkey searches all shared_directories with incoming_* strategies\n   on commit and uses the first one with enough free diskspace.\n   Other strategies can be found in searches.ini, section customized_sharing." = "                Incoming and shared directories.\n   At least two entries have to be present here, one with strategy\n   incoming_files and one with strategy incoming_directories.\n   Both entries can point to the same directory.\n   If one of the two strategies is missing, MLDonkey will create a default\n   directory with its entry here.\n   Finished BT multifile downloads are committed to the first directory\n   with strategy incoming_directories. Other downloads are committed\n   to the first directory with the strategy incoming_files.\n   MLdonkey searches all shared_directories with incoming_* strategies\n   on commit and uses the first one with enough free diskspace.\n   Other strategies can be found in searches.ini, section customized_sharing."
+
+"The list of known friends" = "The list of known friends"
+
+"Shortcuts for special specialized searches" = "Shortcuts for special specialized searches"
+
+"Maximal number of saved searches" = "Maximal number of saved searches"
+
+"List of known servers" = "List of known servers"
+
+"" = ""
+
+"The files currently being downloaded, primary downloads must come first" = "The files currently being downloaded, primary downloads must come first"
+
+"The files whose download is finished" = "The files whose download is finished"
+
+"Depreciated option, kept for compatibility reasons - used by MLDonkey < 2.7.5" = "Depreciated option, kept for compatibility reasons - used by MLDonkey < 2.7.5"
+
+"The users that are defined on this core. The default user is\ncalled 'admin', and uses an empty password. To create new users,\nlogin as admin in mldonkey, and use the 'useradd' command.\n\nuser_groups                   = Files belonging to one of these groups can be seen by the user.\nuser_default_group            = New downloads by this user will belong to this group.\nuser_commit_dir               = Commit files to <incoming>/<user_commit_dir>\nuser_mail                     = Address used to sent confirmation mails after comitting a download\nuser_max_concurrent_downloads = Maximum number of downloads allowed, 0 = unlimited\n" = "The users that are defined on this core. The default user is\ncalled 'admin', and uses an empty password. To create new users,\nlogin as admin in mldonkey, and use the 'useradd' command.\n\nuser_groups                   = Files belonging to one of these groups can be seen by the user.\nuser_default_group            = New downloads by this user will belong to this group.\nuser_commit_dir               = Commit files to <incoming>/<user_commit_dir>\nuser_mail                     = Address used to sent confirmation mails after comitting a download\nuser_max_concurrent_downloads = Maximum number of downloads allowed, 0 = unlimited\n"
+
+"The groups that are defined on this core.\n\ngroup_admin           = Are members of this group MLDonkey admins?\n                        Only members of this group can change settings and see uploads.\n" = "The groups that are defined on this core.\n\ngroup_admin           = Are members of this group MLDonkey admins?\n                        Only members of this group can change settings and see uploads.\n"
+
+"number of lines for GUI console messages" = "number of lines for GUI console messages"
+
+"Post log messages to syslog. This setting is independent of log_file\n  and its associated commands, therefore close_log does not stop log to syslog.\n  Its therefore possible to log to syslog and log_file at the same time." = "Post log messages to syslog. This setting is independent of log_file\n  and its associated commands, therefore close_log does not stop log to syslog.\n  Its therefore possible to log to syslog and log_file at the same time."
+
+"The file in which you want mldonkey to log its debug messages. If you\n  set this option, mldonkey will log this info in the file until you use the\n  'close_log' command. The log file may become very large. You can\n  also enable logging in a file after startup using the 'log_file' command." = "The file in which you want mldonkey to log its debug messages. If you\n  set this option, mldonkey will log this info in the file until you use the\n  'close_log' command. The log file may become very large. You can\n  also enable logging in a file after startup using the 'log_file' command."
+
+"Maximum size of log_file in MB, this value is only checked on startup,\n   log_file will be deleted if its bigger than log_file_size." = "Maximum size of log_file in MB, this value is only checked on startup,\n   log_file will be deleted if its bigger than log_file_size."
+
+"size of log in number of records" = "size of log in number of records"
+
+"If this option is set, IP addresses on the local network are allowed\n  (only for debugging)" = "If this option is set, IP addresses on the local network are allowed\n  (only for debugging)"
+
+"Maximum length of file comments" = "Maximum length of file comments"
+
+"Maximum number of comments per file" = "Maximum number of comments per file"
+
+"(internal option)" = "(internal option)"
+
+"Maximal number of results displayed for a search" = "Maximal number of results displayed for a search"
+
+"The major GC speed is computed from this parameter. This is the memory\n  that will be \"wasted\" because the GC does not immediatly collect \n  unreachable blocks. It is expressed as a percentage of the memory used\n  for live data. The GC will work more (use more CPU time and collect \n  blocks more eagerly) if space_overhead is smaller." = "The major GC speed is computed from this parameter. This is the memory\n  that will be \"wasted\" because the GC does not immediatly collect \n  unreachable blocks. It is expressed as a percentage of the memory used\n  for live data. The GC will work more (use more CPU time and collect \n  blocks more eagerly) if space_overhead is smaller."
+
+"The percentage of free memory before a compaction is triggered" = "The percentage of free memory before a compaction is triggered"
+
+"This option defines a set of date at which some commands have to be executed.\n  For each tuple, the first argument is a list of week days (from 0 to 6),\n  the second is a list of hours (from 0 to 23) and the last one a command to\n  execute. Can be used with 'pause all' and 'resume all' for example to\n  resume and pause downloads automatically for the night." = "This option defines a set of date at which some commands have to be executed.\n  For each tuple, the first argument is a list of week days (from 0 to 6),\n  the second is a list of hours (from 0 to 23) and the last one a command to\n  execute. Can be used with 'pause all' and 'resume all' for example to\n  resume and pause downloads automatically for the night."
+
+"How many samples go into an estimate of transfer rates" = "How many samples go into an estimate of transfer rates"
+
+"The delay between one glance at a file and another" = "The delay between one glance at a file and another"
+
+"timeout when connecting to a server" = "timeout when connecting to a server"
+
+"The delay between two saves of the 'downloads.ini' file (default is 15 minutes).\n  Changes to this option require a core restart." = "The delay between two saves of the 'downloads.ini' file (default is 15 minutes).\n  Changes to this option require a core restart."
+
+"Maximal size in byte of the buffers of a client, minimum 50.000 byte.\nFor high-volume links raise this value to 1.000.000 or higher." = "Maximal size in byte of the buffers of a client, minimum 50.000 byte.\nFor high-volume links raise this value to 1.000.000 or higher."
+
+"Minimal number of results for filter form to appear" = "Minimal number of results for filter form to appear"
+
+"Whether to display results already downloaded" = "Whether to display results already downloaded"
+
+"The minimal delay between two connections to the same client (in seconds)" = "The minimal delay between two connections to the same client (in seconds)"
+
+"The source queues to display in source lists (see 'sources' command)" = "The source queues to display in source lists (see 'sources' command)"
+
+"Size of the minor heap in kB" = "Size of the minor heap in kB"
+
+"Should the MLSUBMIT.REG file be created" = "Should the MLSUBMIT.REG file be created"
+
+"The IP address used to bind the p2p clients" = "The IP address used to bind the p2p clients"
+
+"The delay between reloads of the vd output in the WEB interface" = "The delay between reloads of the vd output in the WEB interface"
+
+"Force compaction every <n> hours (in [1..24])" = "Force compaction every <n> hours (in [1..24])"
+
+"Message printed at startup additional to welcome text" = "Message printed at startup additional to welcome text"
+
+"The height of the command frame in pixel (depends on your screen and browser sizes)" = "The height of the command frame in pixel (depends on your screen and browser sizes)"
+
+"This option controls whether the WEB interface should show frame borders or not" = "This option controls whether the WEB interface should show frame borders or not"
+
+"The realm shown when connecting with a WEB browser" = "The realm shown when connecting with a WEB browser"
+
+"Delay between updates to the GUI" = "Delay between updates to the GUI"
+
+"Is the default terminal an ANSI terminal (escape sequences can be used)" = "Is the default terminal an ANSI terminal (escape sequences can be used)"
+
+"The size long client names will be shortened to in the interface" = "The size long client names will be shortened to in the interface"
+
+"The maximum number of different filenames used by MLDonkey" = "The maximum number of different filenames used by MLDonkey"
+
+"The size long names will be shortened to in the interface" = "The size long names will be shortened to in the interface"
+
+"The size of the buffer between the client and its GUI. Can be useful\n  to increase when the connection between them has a small bandwith" = "The size of the buffer between the client and its GUI. Can be useful\n  to increase when the connection between them has a small bandwith"
+
+"The conversions to apply on Unicode characters" = "The conversions to apply on Unicode characters"
+
+"The maximum time in seconds to wait for networks to cleanly shutdown." = "The maximum time in seconds to wait for networks to cleanly shutdown."
+
+"Define the format of the archive, zip or tar.gz are valid." = "Define the format of the archive, zip or tar.gz are valid."
+
+"Define the total number of options archives in old_config." = "Define the total number of options archives in old_config."
+
+"How often (in hours) should a backup of the ini files be written into old_config.\n  A value of zero means that a backup is written only when the core shuts down." = "How often (in hours) should a backup of the ini files be written into old_config.\n  A value of zero means that a backup is written only when the core shuts down."
+
+"show all eMule mods in statistics" = "show all eMule mods in statistics"
+
+"build statistics about eMule mods" = "build statistics about eMule mods"
+
+"Flush buffers if buffers exceed buffer_writes_threshold kB (experimental)" = "Flush buffers if buffers exceed buffer_writes_threshold kB (experimental)"
+
+"Buffer writes and flush after buffer_writes_delay seconds (experimental)" = "Buffer writes and flush after buffer_writes_delay seconds (experimental)"
+
+"(experimental)" = "(experimental)"
+
+"Regexp of comments to filter out, example: string1|string2|string3" = "Regexp of comments to filter out, example: string1|string2|string3"
+
+"Regexp of messages to filter out, example: string1|string2|string3" = "Regexp of messages to filter out, example: string1|string2|string3"
+
+"Allow others to browse our share list (0: none, 1: friends only, 2: everyone" = "Allow others to browse our share list (0: none, 1: friends only, 2: everyone"
+
+"Allow you to use any command with ! in the interface instead of only the\n  ones in allowed_commands" = "Allow you to use any command with ! in the interface instead of only the\n  ones in allowed_commands"
+
+"Commands that you are allowed to be call from the interface. These\n  commands should short, so that the core is not blocked more than necessary." = "Commands that you are allowed to be call from the interface. These\n  commands should short, so that the core is not blocked more than necessary."
+
+"Name of GUI to start" = "Name of GUI to start"
+
+"Directory where mldonkey binaries are installed" = "Directory where mldonkey binaries are installed"
+
+"Name of program used for preview (first arg is local filename, second arg\n  is name of file as searched on eDonkey" = "Name of program used for preview (first arg is local filename, second arg\n  is name of file as searched on eDonkey"
+
+"Send a warning mail each <interval> hours for each directory, 0 to deactivate mail warnings." = "Send a warning mail each <interval> hours for each directory, 0 to deactivate mail warnings."
+
+"If true core shuts down when free space on core dir is below hdd_coredir_minfree,\n  otherwise all downloads are paused and a warning email is sent." = "If true core shuts down when free space on core dir is below hdd_coredir_minfree,\n  otherwise all downloads are paused and a warning email is sent."
+
+"Mininum free space in MB on core directory, minimum 20" = "Mininum free space in MB on core directory, minimum 20"
+
+"If true core shuts down when free space on temp dir is below hdd_temp_minfree,\n  otherwise all downloads are paused and a warning email is sent." = "If true core shuts down when free space on temp dir is below hdd_temp_minfree,\n  otherwise all downloads are paused and a warning email is sent."
+
+"Mininum free space in MB on temp_directory, minimum 50" = "Mininum free space in MB on temp_directory, minimum 50"
+
+"Create new files as sparse, only valid on MinGW for files on NTFS drives" = "Create new files as sparse, only valid on MinGW for files on NTFS drives"
+
+"New directories in incoming_directories are created with these rights (in octal)" = "New directories in incoming_directories are created with these rights (in octal)"
+
+"New download files are created with these rights (in octal)" = "New download files are created with these rights (in octal)"
+
+"How often (in minutes) should MLDonkey scan all shared directories for new/removed files.\n  0 to disable scanning of shared directories. Use command reshare to manually scan shares.\n  When core starts all shared directories are scanned once, independent of this option." = "How often (in minutes) should MLDonkey scan all shared directories for new/removed files.\n  0 to disable scanning of shared directories. Use command reshare to manually scan shares.\n  When core starts all shared directories are scanned once, independent of this option."
+
+"The directory where temporary files should be put" = "The directory where temporary files should be put"
+
+"How many megabytes should MLdonkey keep for saving configuration files." = "How many megabytes should MLdonkey keep for saving configuration files."
+
+"Should MLdonkey try to recover downloads of files in temp/ at startup" = "Should MLdonkey try to recover downloads of files in temp/ at startup"
+
+"Automatically Start the GUI" = "Automatically Start the GUI"
+
+"Ask for GUI start" = "Ask for GUI start"
+
+"The UID of the user (0=disabled) you want mldonkey to run as, after the ports\n  have been bound (can be use not to run with root priviledges when\n  a port < 1024 is needed)" = "The UID of the user (0=disabled) you want mldonkey to run as, after the ports\n  have been bound (can be use not to run with root priviledges when\n  a port < 1024 is needed)"
+
+"The login of the user you want mldonkey to run as, after the ports\n  have been bound (can be use not to run with root priviledges when\n  a port < 1024 is needed)" = "The login of the user you want mldonkey to run as, after the ports\n  have been bound (can be use not to run with root priviledges when\n  a port < 1024 is needed)"
+
+"The command which is called when a download is started. Arguments\n  are '-file <num>'" = "The command which is called when a download is started. Arguments\n  are '-file <num>'"
+
+"A command that is called when a file is committed, does not work on MinGW.\n  Arguments are (kept for compatability):\n    $1 - temp file name, without path\n    $2 - file size\n    $3 - filename of the committed file\n  Also these environment variables can be used (prefered way):\n    $TEMPNAME  - temp file name, including path\n    $FILEID    - same as $1\n    $FILESIZE  - same as $2\n    $FILENAME  - same as $3\n    $FILEHASH  - internal hash\n    $DURATION  - download duration\n    $INCOMING  - directory used for commit\n    $NETWORK   - network used for downloading\n    $ED2K_HASH - ed2k hash if MD4 is known\n  " = "A command that is called when a file is committed, does not work on MinGW.\n  Arguments are (kept for compatability):\n    $1 - temp file name, without path\n    $2 - file size\n    $3 - filename of the committed file\n  Also these environment variables can be used (prefered way):\n    $TEMPNAME  - temp file name, including path\n    $FILEID    - same as $1\n    $FILESIZE  - same as $2\n    $FILENAME  - same as $3\n    $FILEHASH  - internal hash\n    $DURATION  - download duration\n    $INCOMING  - directory used for commit\n    $NETWORK   - network used for downloading\n    $ED2K_HASH - ed2k hash if MD4 is known\n  "
+
+"The maximal length of zero bytes between non-zero bytes in a file that\n  should be interpreted as downloaded during a recovery" = "The maximal length of zero bytes between non-zero bytes in a file that\n  should be interpreted as downloaded during a recovery"
+
+"How many sources to use to download each chunk" = "How many sources to use to download each chunk"
+
+"The maximal number of files in Downloading state (other ones are Queued)" = "The maximal number of files in Downloading state (other ones are Queued)"
+
+"Set to true if you want all new downloads be paused immediatly\n  will be set to false on core start." = "Set to true if you want all new downloads be paused immediatly\n  will be set to false on core start."
+
+"Set to false if you don't want mldonkey to automatically put completed files\n  in incoming directory" = "Set to false if you don't want mldonkey to automatically put completed files\n  in incoming directory"
+
+"Put a prefix for the filename here which shows up in the notification mail" = "Put a prefix for the filename here which shows up in the notification mail"
+
+"Send filename in mail subject" = "Send filename in mail subject"
+
+"Does your mail-server need <...> around addresses" = "Does your mail-server need <...> around addresses"
+
+"Your e-mail if you want to receive mails when downloads are completed" = "Your e-mail if you want to receive mails when downloads are completed"
+
+"The port to use on the mail server (default 25)" = "The port to use on the mail server (default 25)"
+
+"The mail server you want to use (must be SMTP). Use hostname or IP address" = "The mail server you want to use (must be SMTP). Use hostname or IP address"
+
+"Direct TCP connections to HTTP proxy (the proxy should support CONNECT)" = "Direct TCP connections to HTTP proxy (the proxy should support CONNECT)"
+
+"Port of HTTP proxy" = "Port of HTTP proxy"
+
+"Direct HTTP queries to HTTP proxy" = "Direct HTTP queries to HTTP proxy"
+
+"Cookies send with a http request (used for .torrent files and web_infos)" = "Cookies send with a http request (used for .torrent files and web_infos)"
+
+"Should a connection check if the peer we are connected to is still alive?\n  This implies some bandwidth-cost (with 200 connections ~10-20%)" = "Should a connection check if the peer we are connected to is still alive?\n  This implies some bandwidth-cost (with 200 connections ~10-20%)"
+
+"The size of the minimal packet you want mldonkey to send when data is\n  available on the connection" = "The size of the minimal packet you want mldonkey to send when data is\n  available on the connection"
+
+"The size of the MTU of a TCP/IP packet on your connection" = "The size of the MTU of a TCP/IP packet on your connection"
+
+"The size of the header of a TCP/IP packet on your connection (ppp adds\n  14 bytes sometimes, so modify to take that into account)" = "The size of the header of a TCP/IP packet on your connection (ppp adds\n  14 bytes sometimes, so modify to take that into account)"
+
+"Location of GeoIP.dat (Get one from http://www.maxmind.com/download/geoip/database/)" = "Location of GeoIP.dat (Get one from http://www.maxmind.com/download/geoip/database/)"
+
+"false: use ip_blocking_countries as block list, all other countries are allowed\n  true: use ip_blocking_countries as allow list, all other countries are blocked" = "false: use ip_blocking_countries as block list, all other countries are allowed\n  true: use ip_blocking_countries as allow list, all other countries are blocked"
+
+"List of countries to block connections from/to (requires Geoip).\n  Names are in ISO 3166 format, see http://www.maxmind.com/app/iso3166\n  You can also at your own risk use \"Unknown\" for IPs Geoip won't recognize." = "List of countries to block connections from/to (requires Geoip).\n  Names are in ISO 3166 format, see http://www.maxmind.com/app/iso3166\n  You can also at your own risk use \"Unknown\" for IPs Geoip won't recognize."
+
+"IP blocking list filename (peerguardian format), can also be in gz/bz2/zip format\n  Zip files must contain either a file named guarding.p2p or guarding_full.p2p." = "IP blocking list filename (peerguardian format), can also be in gz/bz2/zip format\n  Zip files must contain either a file named guarding.p2p or guarding_full.p2p."
+
+"Keep IP blocking ranges descriptions in memory" = "Keep IP blocking ranges descriptions in memory"
+
+"If MLDonkey can not read broken RSS feeds, use this program to preprocess them" = "If MLDonkey can not read broken RSS feeds, use this program to preprocess them"
+
+"URLs of RSS feeds" = "URLs of RSS feeds"
+
+"A list of lines to download on the WEB: each line has\n  the format: (kind, period, url), where kind is either\n  'server.met' for a server.met file (also in gz/bz2/zip format)\n               containing ed2k server, or\n  'comments.met' for a file of comments, or\n  'guarding.p2p' for a blocklist file (also in gz/bz2/zip format), or\n  'ocl' for file in the ocl format containing overnet peers, or\n  'contact.dat' for an contact.dat file containing overnet peers,\n  'nodes.gzip' for a fasttrack nodes.gzip,\n  and period is the period between updates (in hours),\n  a period of zero means the file is only loaded once on startup,\n  and url is the url of the file to download.\n  IMPORTANT: Put the URL and the kind between quotes.\n  EXAMPLE:\n    web_infos = [\n    (\"server.met\", 0, \"http://www.gruk.org/server.met.gz\");\n    (\"hublist\", 0, \"http://dchublist.com/hublist.config.bz2\");\n    (\"guarding.p2p\", 96, \"http://www.bluetack.co.uk/config/level1.gz\");\n    (\"ocl\", 24, \"http://members.lycos.co.uk/appbyhp2/FlockHelpApp/contact-files/contact.ocl\");\n    (\"contact.dat\", 168, \"http://download.overnet.org/contact.dat\");\n    (\"geoip.dat\", 168, \"http://www.maxmind.com/download/geoip/database/GeoIP.dat.gz\");\n    ]\n  " = "A list of lines to download on the WEB: each line has\n  the format: (kind, period, url), where kind is either\n  'server.met' for a server.met file (also in gz/bz2/zip format)\n               containing ed2k server, or\n  'comments.met' for a file of comments, or\n  'guarding.p2p' for a blocklist file (also in gz/bz2/zip format), or\n  'ocl' for file in the ocl format containing overnet peers, or\n  'contact.dat' for an contact.dat file containing overnet peers,\n  'nodes.gzip' for a fasttrack nodes.gzip,\n  and period is the period between updates (in hours),\n  a period of zero means the file is only loaded once on startup,\n  and url is the url of the file to download.\n  IMPORTANT: Put the URL and the kind between quotes.\n  EXAMPLE:\n    web_infos = [\n    (\"server.met\", 0, \"http://www.gruk.org/server.met.gz\");\n    (\"hublist\", 0, \"http://dchublist.com/hublist.config.bz2\");\n    (\"guarding.p2p\", 96, \"http://www.bluetack.co.uk/config/level1.gz\");\n    (\"ocl\", 24, \"http://members.lycos.co.uk/appbyhp2/FlockHelpApp/contact-files/contact.ocl\");\n    (\"contact.dat\", 168, \"http://download.overnet.org/contact.dat\");\n    (\"geoip.dat\", 168, \"http://www.maxmind.com/download/geoip/database/GeoIP.dat.gz\");\n    ]\n  "
+
+"User agent string (default = \"default\")" = "User agent string (default = \"default\")"
+
+"Use http://ip.discoveryvip.com/ip.asp to obtain WAN IP" = "Use http://ip.discoveryvip.com/ip.asp to obtain WAN IP"
+
+"Use the IP specified by 'client_ip' instead of trying to determine it\n  ourself. Don't set this option to true if you have dynamic IP." = "Use the IP specified by 'client_ip' instead of trying to determine it\n  ourself. Don't set this option to true if you have dynamic IP."
+
+"The last IP address used for this client" = "The last IP address used for this client"
+
+"Use javascript to display option help text as js popup (true=use js, false=use html tables)" = "Use javascript to display option help text as js popup (true=use js, false=use html tables)"
+
+"How long to display the tooltips" = "How long to display the tooltips"
+
+"How long to wait before displaying the tooltips" = "How long to wait before displaying the tooltips"
+
+"Whether to use the fancy javascript tooltips or plain html-title" = "Whether to use the fancy javascript tooltips or plain html-title"
+
+"Use gzip compression on web pages" = "Use gzip compression on web pages"
+
+"Whether to use checkboxes in the WEB interface for search result list" = "Whether to use checkboxes in the WEB interface for search result list"
+
+"Whether to use checkboxes in the WEB interface for download list" = "Whether to use checkboxes in the WEB interface for download list"
+
+"html_mods_theme to use (located in relative html_themes/<theme_name> directory\n  leave blank to use internal theme" = "html_mods_theme to use (located in relative html_themes/<theme_name> directory\n  leave blank to use internal theme"
+
+"bw_stats refresh delay (seconds)" = "bw_stats refresh delay (seconds)"
+
+"Maximum chat messages to log in memory" = "Maximum chat messages to log in memory"
+
+"Whether to load the mldonkey_messages.ini file (false=use internal settings)" = "Whether to load the mldonkey_messages.ini file (false=use internal settings)"
+
+"Whether to display the pending slots in uploaders command" = "Whether to display the pending slots in uploaders command"
+
+"Change max width of chunk graph" = "Change max width of chunk graph"
+
+"Change style of chunk graph" = "Change style of chunk graph"
+
+"Whether to display chunks list as graph or text in vd output" = "Whether to display chunks list as graph or text in vd output"
+
+"Change height of download indicator bar in vd output" = "Change height of download indicator bar in vd output"
+
+"Whether to display the Priority column in vd output" = "Whether to display the Priority column in vd output"
+
+"Whether to display the Last column in vd output" = "Whether to display the Last column in vd output"
+
+"Tag graph y size in vd output ( 50 < x < 1200 )" = "Tag graph y size in vd output ( 50 < x < 1200 )"
+
+"Tag graph x size in vd output ( 130 < x < 3600 )" = "Tag graph x size in vd output ( 130 < x < 3600 )"
+
+"Tag graph upload y pos in vd output" = "Tag graph upload y pos in vd output"
+
+"Tag graph upload x pos in vd output" = "Tag graph upload x pos in vd output"
+
+"Tag graph download y pos in vd output" = "Tag graph download y pos in vd output"
+
+"Tag graph download x pos in vd output" = "Tag graph download x pos in vd output"
+
+"Tag graph title y pos in vd output" = "Tag graph title y pos in vd output"
+
+"Tag graph title x pos in vd output" = "Tag graph title x pos in vd output"
+
+"Tag graph title" = "Tag graph title"
+
+"Enable tag graph title" = "Enable tag graph title"
+
+"Draw tag as png if true, else draw as jpg in vd output" = "Draw tag as png if true, else draw as jpg in vd output"
+
+"Tag source image name" = "Tag source image name"
+
+"Use tag source image " = "Use tag source image "
+
+"Draw tag graph" = "Draw tag graph"
+
+"Number of shown subgrids on graph (0 = no subgrids)" = "Number of shown subgrids on graph (0 = no subgrids)"
+
+"Max hours on time scale per grid (0 = no limit)" = "Max hours on time scale per grid (0 = no limit)"
+
+"Dynamic grid width, start with 1 h/grid, maximum html_mods_vd_gfx_h_grid_time h/grid" = "Dynamic grid width, start with 1 h/grid, maximum html_mods_vd_gfx_h_grid_time h/grid"
+
+"compute values for hourly graph every 1,2,3,4,5,10,15,20,30,60 min\n\tChanges to this option require a core restart." = "compute values for hourly graph every 1,2,3,4,5,10,15,20,30,60 min\n\tChanges to this option require a core restart."
+
+"Graph y size in vd output ( 200 < y < 1200 )" = "Graph y size in vd output ( 200 < y < 1200 )"
+
+"Graph x size in vd output ( 365 < x < 3665 )" = "Graph x size in vd output ( 365 < x < 3665 )"
+
+"Show hourly graph in vd output" = "Show hourly graph in vd output"
+
+"Draw graph as png if true, else draw as jpg in vd output" = "Draw graph as png if true, else draw as jpg in vd output"
+
+"Show transparent graph in vd output (only for png)" = "Show transparent graph in vd output (only for png)"
+
+"Show mean line on graph in vd output" = "Show mean line on graph in vd output"
+
+"Flip up/side graph position in vd output" = "Flip up/side graph position in vd output"
+
+"Stacked download and upload graph" = "Stacked download and upload graph"
+
+"Split download and upload graph in vd output" = "Split download and upload graph in vd output"
+
+"Fill graph in vd output" = "Fill graph in vd output"
+
+"Remove graph files on core shutdown" = "Remove graph files on core shutdown"
+
+"Show graph in vd output" = "Show graph in vd output"
+
+"Whether to display flags instead of country codes" = "Whether to display flags instead of country codes"
+
+"Whether to display the Age column in vd output" = "Whether to display the Age column in vd output"
+
+"Whether to display the Active Sources column in vd output" = "Whether to display the Active Sources column in vd output"
+
+"Whether to display the Group column in vd output" = "Whether to display the Group column in vd output"
+
+"Whether to display the User column in vd output" = "Whether to display the User column in vd output"
+
+"Whether to display the Comments column in vd output" = "Whether to display the Comments column in vd output"
+
+"Whether to display the Net column in vd output" = "Whether to display the Net column in vd output"
+
+"Whether to use relative availability in the WEB interface" = "Whether to use relative availability in the WEB interface"
+
+"Whether to use human readable GMk number format" = "Whether to use human readable GMk number format"
+
+"Which html_mods style to use (set with html_mods_style command)" = "Which html_mods style to use (set with html_mods_style command)"
+
+"Whether to use the modified WEB interface" = "Whether to use the modified WEB interface"
+
+"Set to true if you also want mldonkey to download HTTP files (experimental)" = "Set to true if you also want mldonkey to download HTTP files (experimental)"
+
+"Set to true if you also want mldonkey to run as a OpenFT sub node (experimental)" = "Set to true if you also want mldonkey to run as a OpenFT sub node (experimental)"
+
+"Set to true if you also want mldonkey to run as a direct-connect node (experimental)" = "Set to true if you also want mldonkey to run as a direct-connect node (experimental)"
+
+"Set to true if you also want mldonkey to run as a Fasttrack sub node (experimental)" = "Set to true if you also want mldonkey to run as a Fasttrack sub node (experimental)"
+
+"Set to true if you also want mldonkey to run as a gnutella2 sub node (experimental)" = "Set to true if you also want mldonkey to run as a gnutella2 sub node (experimental)"
+
+"Set to true if you also want mldonkey to run as a gnutella1 sub node (experimental)" = "Set to true if you also want mldonkey to run as a gnutella1 sub node (experimental)"
+
+"Set to true if you also want mldonkey to run as a soulseek client (experimental)" = "Set to true if you also want mldonkey to run as a soulseek client (experimental)"
+
+"Set to true if you also want mldonkey to run as a napster client (experimental)" = "Set to true if you also want mldonkey to run as a napster client (experimental)"
+
+"Set to true if you also want mldonkey to run as a donkey client" = "Set to true if you also want mldonkey to run as a donkey client"
+
+"Set to true if you also want mldonkey to run as an Bittorrent client" = "Set to true if you also want mldonkey to run as an Bittorrent client"
+
+"Set to true if you want mldonkey to connect to edonkey servers\n  (enable_donkey must be true, and only experimental)" = "Set to true if you want mldonkey to connect to edonkey servers\n  (enable_donkey must be true, and only experimental)"
+
+"Set to true if you also want mldonkey to run as an kademlia client\n  (enable_donkey must be true, and only experimental)" = "Set to true if you also want mldonkey to run as an kademlia client\n  (enable_donkey must be true, and only experimental)"
+
+"Set to true if you also want mldonkey to run as an overnet client\n  (enable_donkey must be true)" = "Set to true if you also want mldonkey to run as an overnet client\n  (enable_donkey must be true)"
+
+"This option enables MLdonkey to always read as much data as possible\n  from a channel, but use more CPU as it must then copy the data in the\n  channel buffer." = "This option enables MLdonkey to always read as much data as possible\n  from a channel, but use more CPU as it must then copy the data in the\n  channel buffer."
+
+"No-limit IPs" = "No-limit IPs"
+
+"list of IP addresses allowed to connect to the core with no limit on\n  upload/download and upload slots.  List separated by spaces, wildcard=255\n  ie: use 192.168.0.255 for 192.168.0.* " = "list of IP addresses allowed to connect to the core with no limit on\n  upload/download and upload slots.  List separated by spaces, wildcard=255\n  ie: use 192.168.0.255 for 192.168.0.* "
+
+"The delay in milliseconds to wait in the event loop. Can be decreased to\n  increase the bandwidth usage, or increased to lower the CPU usage." = "The delay in milliseconds to wait in the event loop. Can be decreased to\n  increase the bandwidth usage, or increased to lower the CPU usage."
+
+"Maximal number of connections that can be opened per second" = "Maximal number of connections that can be opened per second"
+
+"Set this to true if you want to have dynamic upload slot allocation (experimental)" = "Set this to true if you want to have dynamic upload slot allocation (experimental)"
+
+"Maximum file size to benefit from the reserved slot for small files (0 to disable)" = "Maximum file size to benefit from the reserved slot for small files (0 to disable)"
+
+"Set aside a single reserved slot to upload to friends" = "Set aside a single reserved slot to upload to friends"
+
+"How many percent of upload slots can be used for downloading files tagged as release" = "How many percent of upload slots can be used for downloading files tagged as release"
+
+"How many slots can be used for upload" = "How many slots can be used for upload"
+
+"Amount of indirect connections in percent (min 30, max 70) of max_opened_connections" = "Amount of indirect connections in percent (min 30, max 70) of max_opened_connections"
+
+"Maximal number of opened connections" = "Maximal number of opened connections"
+
+"Second maximal download rate for easy toggling (use bw_toggle)" = "Second maximal download rate for easy toggling (use bw_toggle)"
+
+"Second maximal upload rate for easy toggling (use bw_toggle)" = "Second maximal upload rate for easy toggling (use bw_toggle)"
+
+"The maximal download rate you can tolerate on your link in kBytes/s (0 = no limit)\n  The limit will apply on all your connections (clients and servers) and both\n  control and data messages. Maximum value depends on max_hard_upload_rate:\n  >= 10    -> unlimited download\n  < 10 > 3 -> download limited to upload * 4\n  < 4      -> download limited to upload * 3" = "The maximal download rate you can tolerate on your link in kBytes/s (0 = no limit)\n  The limit will apply on all your connections (clients and servers) and both\n  control and data messages. Maximum value depends on max_hard_upload_rate:\n  >= 10    -> unlimited download\n  < 10 > 3 -> download limited to upload * 4\n  < 4      -> download limited to upload * 3"
+
+"The maximal upload rate you can tolerate on your link in kBytes/s (0 = no limit)\n  The limit will apply on all your connections (clients and servers) and both\n  control and data messages." = "The maximal upload rate you can tolerate on your link in kBytes/s (0 = no limit)\n  The limit will apply on all your connections (clients and servers) and both\n  control and data messages."
+
+"A space-separated list of keywords. Each keyword triggers\n  printing information on the corresponding messages:\n  verb : verbose mode (interesting not only for coders)\n  mc : debug client messages\n  mr|raw : debug raw messages\n  mct : debug emule clients tags\n  ms : debug server messages\n  sm : debug source management\n  net : debug net\n  gui : debug gui\n  no-login : disable login messages\n  file : debug file handling\n  do : some download warnings\n  up : some upload warnings\n  unk : unknown messages\n  ov : overnet\n  loc : debug source research/master servers\n  share: debug sharing\n  md4 : md4 computation\n  connect : debug connections\n  udp : udp messages\n  ultra|super : debug supernode\n  swarming : debug swarming\n  hc : http_client messages\n  hs : http_server messages\n  com : commands by non-admin users\n  act : debug activity\n  bw : debug bandwidth\n  geo : debug GeoIP\n  unexp : debug unexpected messages" = "A space-separated list of keywords. Each keyword triggers\n  printing information on the corresponding messages:\n  verb : verbose mode (interesting not only for coders)\n  mc : debug client messages\n  mr|raw : debug raw messages\n  mct : debug emule clients tags\n  ms : debug server messages\n  sm : debug source management\n  net : debug net\n  gui : debug gui\n  no-login : disable login messages\n  file : debug file handling\n  do : some download warnings\n  up : some upload warnings\n  unk : unknown messages\n  ov : overnet\n  loc : debug source research/master servers\n  share: debug sharing\n  md4 : md4 computation\n  connect : debug connections\n  udp : udp messages\n  ultra|super : debug supernode\n  swarming : debug swarming\n  hc : http_client messages\n  hs : http_server messages\n  com : commands by non-admin users\n  act : debug activity\n  bw : debug bandwidth\n  geo : debug GeoIP\n  unexp : debug unexpected messages"
+
+"Aliases to commands. The alias (fist string) has to be\n  whitespaceless, the outcome of the alias (second string)\n  may have spaces (put it in quotation then)." = "Aliases to commands. The alias (fist string) has to be\n  whitespaceless, the outcome of the alias (second string)\n  may have spaces (put it in quotation then)."
+
+"Improved telnet interface" = "Improved telnet interface"
+
+"Should *all* sources for a file be shown on HTML/telnet vd <num>" = "Should *all* sources for a file be shown on HTML/telnet vd <num>"
+
+"The IP address used to bind the telnet server" = "The IP address used to bind the telnet server"
+
+"The IP address used to bind the gui server" = "The IP address used to bind the gui server"
+
+"The IP address used to bind the http server" = "The IP address used to bind the http server"
+
+"The port to connect via telnet" = "The port to connect via telnet"
+
+"port for user interaction" = "port for user interaction"
+
+"The port to connect via HTTP" = "The port to connect via HTTP"
+
+"The port used to connect to your client with a WEB browser" = "The port used to connect to your client with a WEB browser"
+
+"The port to connect for GiFT GUIs." = "The port to connect for GiFT GUIs."
+
+"port for GiFT Graphical Interfaces interaction. It was 1213, but the default is\n  now 0 for disabled, because it does not check for a password." = "port for GiFT Graphical Interfaces interaction. It was 1213, but the default is\n  now 0 for disabled, because it does not check for a password."
+
+"The port to connect the GUI" = "The port to connect the GUI"
+
+"port for Graphical Interfaces" = "port for Graphical Interfaces"
+
+"Allowed IPs" = "Allowed IPs"
+
+"list of IP address allowed to connect to the core via telnet/GUI/WEB\n  for internal command set: list separated by spaces\n  example for internal command: set allowed_ips \"127.0.0.0/8 192.168.1.2\"\n  or for editing the ini-file: list separated by semi-colon\n  example for ini-file: allowed_ips = [ \"127.0.0.0/8\"; \"192.168.1.2\";]\n  CIDR and range notations are supported: ie use 192.168.0.0/24\n  or 192.168.0.0-192.168.0.255 for 192.168.0.*" = "list of IP address allowed to connect to the core via telnet/GUI/WEB\n  for internal command set: list separated by spaces\n  example for internal command: set allowed_ips \"127.0.0.0/8 192.168.1.2\"\n  or for editing the ini-file: list separated by semi-colon\n  example for ini-file: allowed_ips = [ \"127.0.0.0/8\"; \"192.168.1.2\";]\n  CIDR and range notations are supported: ie use 192.168.0.0/24\n  or 192.168.0.0-192.168.0.255 for 192.168.0.*"
+
+"small name of client" = "small name of client"
+
+"loaded language resource file" = "loaded language resource file"
+
+(************************************)
+         module "CommonMessages"
+(************************************)
+
+"Full access enabled" = "Full access enabled"
+
+"Bad login/password" = "Bad login/password"
+
+"Command not authorized\n use 'auth <user> <password>' before." = "Command not authorized\n use 'auth <user> <password>' before."
+
+"Main commands are:\n" = "Main commands are:\n"
+
+"Available commands are:\n" = "Available commands are:\n"
+
+(************************************)
+         module "CommonStats"
+(************************************)
+
+"Country-based traffic statistics" = "Country-based traffic statistics"
+
+"Uptime" = "Uptime"
+
diff --git a/config/mldonkey/mlsubmit.reg b/config/mldonkey/mlsubmit.reg
index 981aca4cf..b38ebe2c5 100644
--- a/config/mldonkey/mlsubmit.reg
+++ b/config/mldonkey/mlsubmit.reg
@@ -9,4 +9,4 @@ Windows Registry Editor Version 5.00
 [HKEY_CLASSES_ROOT\ed2k\shell\open]
 
 [HKEY_CLASSES_ROOT\ed2k\shell\open\command]
-@="\"IEXPLORE.EXE\" \"http://admin:@127.0.0.1:4080/submit?q=dllink+%1\""
+@="\"IEXPLORE.EXE\" \"http://admin:@192.168.181.70:4080/submit?q=dllink+%1\""
diff --git a/config/mldonkey/old_config/backup-20060718-051804.tar.gz b/config/mldonkey/old_config/backup-20060718-051804.tar.gz
deleted file mode 100644
index 5d68746b5..000000000
Binary files a/config/mldonkey/old_config/backup-20060718-051804.tar.gz and /dev/null differ
diff --git a/config/mldonkey/old_config/bittorrent.ini b/config/mldonkey/old_config/bittorrent.ini
deleted file mode 100644
index 14faf87c5..000000000
--- a/config/mldonkey/old_config/bittorrent.ini
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-    (************************************)
-    (*   Never edit options files when  *)
-    (*       the daemon is running      *)
-    (************************************)
-    (* SECTION : Bittorrent *)
-    (* Bittorrent options *)
-    (************************************)
-
-
-
-	(* The port to bind the client to *)
- client_port = 6882
-
-	(* The UID of this client *)
- client_uid = FVGUYMROG4XDOLN7O4WJZ2KKH7IL5CBE
-
-	(* Ask the tracker for new sources only if you have fewer than that number of sources *)
- ask_tracker_threshold = 20
-
-	(* Maximum number of HTTP redirects before reaching the tracker - maximum 10, 0 to disable *)
- max_tracker_redirect = 1
-
-	(* Send client key to trackers *)
- send_key = true
-
-	(* Maximum number of uploaders for one torrent *)
- max_uploaders_per_torrent = 5
-
-	(* Maximum number of uploaders for bittorrent *)
- max_bt_uploaders = 5
-
-	(* Number of peers to request from tracker (Negative # = let tracker decide) *)
- numwant = -1
-
-	(* Interval in seconds 'torrents/incoming' is scanned for new torrent files to be downloaded, 0 to deactivate, changes require restart *)
- import_new_torrents_interval = 60.
-
-	(* Minimum time in seconds to wait between asking the tracker for sources *)
- min_tracker_reask_interval = 300
-
-	(* Timeout on client connections *)
- client_timeout = 90.
-
-	(* User agent string (default = "default") *)
- user_agent = default
-
-	(* (internal option) *)
- options_version = 0
- old_files = []
-
-	(* The port to bind the tracker to *)
- tracker_port = 6881
-
-	(* The maximal number of tracked files (to prevend saturation attack) *)
- max_tracked_files = 100
-
-	(* The maximal number of peers returned by the tracker *)
- max_tracker_reply = 20
-
-	(* The tracker will check the torrent file is available if an announce request is received *)
- tracker_force_local_torrents = true
-
-	(* The tracker will check the client key to update ip if changed *)
- tracker_use_key = true
-
-	(* Let you define a default tracker for creating torrents (leave empty for mlnet tracker) *)
- default_tracker = ""
-
-	(* Let you define a default comment for creating torrents *)
- default_comment = ""
-
-(*
- The following options are not used (errors, obsolete, ...) 
-*)
diff --git a/config/mldonkey/old_config/donkey.ini b/config/mldonkey/old_config/donkey.ini
deleted file mode 100644
index d19961e1e..000000000
--- a/config/mldonkey/old_config/donkey.ini
+++ /dev/null
@@ -1,304 +0,0 @@
-
-
-    (************************************)
-    (*   Never edit options files when  *)
-    (*       the daemon is running      *)
-    (************************************)
-    (* SECTION : Donkey *)
-    (* Donkey options *)
-    (************************************)
-
-
-
-	(* The port used for connection by other donkey clients. *)
- port = 4662
-
-	(* The number of servers you want to stay connected to *)
- max_connected_servers = 3
-
-	(* Should mldonkey try to detect sources responsible for corruption and ban them *)
- reliable_sources = true
-
-	(* Should mldonkey try to detect sources masquerading as others and ban them *)
- ban_identity_thieves = true
-
-	(* A list of server IP to remove from server list.
-	    Servers on this list can't be added, and will eventually be removed *)
- server_black_list = []
-
-	(* immediately close connection to servers that don't grant a High ID *)
- force_high_id = false
-
-	(* send all clients your IP regardless of what ID was assigned by the server *)
- force_client_high_id = false
-
-	(* Set this option to false if you don't want to
-	    receive new servers from servers *)
- update_server_list_server = true
-
-	(* Set this option to false if you don't want to
-	    receive new servers from server.met *)
- update_server_list_server_met = true
-
-	(* Set this option to false if you don't want to
-	    receive new servers from clients *)
- update_server_list_client = false
-
-	(* Maximal number of sources for each file *)
- max_sources_per_file = 5000
-
-	(* The MD4 of this client *)
- client_md4 = "00E0B50D660EA80F530BC4C540506FA4"
-
-	(* The RSA private key of this client *)
- client_private_key = "MIIBCAIBADANBgkqhkiG9w0BAQEFAASB8zCB8AIBAAIxAKVGA5DvO9HEl/pov8Fqc1E5mp83Uy3oRQ9Ob9ycWxpC47HyAHpaMUfr9WLj2+BrZwIBEQIwMJwfKqC3PbJK0S3eC7Xlrnpap0yB4FNfIZYVovj86sjd9su5EHoIlORptq5L7kSBAhkAu7MM9al0lYqt/3eEC5/D7Da22OKOPJFZAhkA4WnmIz3xAA1DBPkHNrUc+xMKUBcYRoq/AhkAsKiEqvnXI1VYd/gDzrR8KZzoU6gNZi5xAhhCTFK/EjfS1rlb0MXi6fl3BZmfFdn2oUcCGHfyegqjsdMDeH7mDwqIRlXG/JrilDZ8Og=="
-
-	(* Enable secure user identification support *)
- enable_sui = true
-
-	(* min connected users for each server *)
- min_users_on_server = 0
-
-	(* login of client on eDonkey network (nothing default to global one) *)
- login = ""
-
-	(* The files that were downloaded *)
- old_files = []
-
-
-    (************************************)
-    (* SECTION : Overnet *)
-    (* Overnet options *)
-    (************************************)
-
-
- Overnet = {
-
-	(* The protocol version sent on Overnet connections replies *)
-   protocol_connectreply_version = 44
-
-	(* The protocol version sent on Overnet connections *)
-   protocol_connect_version = 1044
-
-	(* Set this option to false if you don't want to receive new Overnet peers *)
-   update_nodes = true
-
-	(* The MD4 of the Overnet client *)
-   md4 = F168E4A3FCDADBBF8175AA5DFBAE8B89
-
-	(* These IP addresses cannot be peers. Elements are separated by spaces, wildcard=255 ie: use 192.168.0.255 for 192.168.0.*  *)
-   exclude_peers = [
-    "1.0.0.0";]
-
-	(* Interval (in seconds) before republish files *)
-   republish = 10800.
-
-	(* Max number of hits in a search on Overnet *)
-   max_search_hits = 200
-
-	(* Period between two queries in the overnet tree (should not be set under 5) *)
-   query_peer_period = 5.
-
-	(* How long shoud a search on Overnet wait for the last answer before terminating *)
-   search_timeout = 140
-
-	(* allow extended search to search on overnet *)
-   search_keyword = true
-
-	(* maximal number of peers to keep overnet connected (should be >2048) *)
-   max_known_peers = 8192
-
-	(* Size of the filename storage used to answer queries *)
-   store_size = 2000
-
-	(* port for overnet *)
-   port = 21984
-}
-
-
-    (************************************)
-    (* SECTION : Kademlia *)
-    (* Kademlia options *)
-    (************************************)
-
-
- Kademlia = {
-
-	(* Set this option to false if you don't want to receive new Overnet peers *)
-   update_nodes = true
-
-	(* The MD4 of the Overnet client *)
-   md4 = C5A53009B6AC813961C80F7BD0CC99B4
-
-	(* These IP addresses cannot be peers. Elements are separated by spaces, wildcard=255 ie: use 192.168.0.255 for 192.168.0.*  *)
-   exclude_peers = [
-    "1.0.0.0";]
-
-	(* Interval (in seconds) before republish files *)
-   republish = 10800.
-
-	(* Max number of hits in a search on Overnet *)
-   max_search_hits = 200
-
-	(* Period between two queries in the overnet tree (should not be set under 5) *)
-   query_peer_period = 5.
-
-	(* How long shoud a search on Overnet wait for the last answer before terminating *)
-   search_timeout = 140
-
-	(* allow extended search to search on overnet *)
-   search_keyword = true
-
-	(* maximal number of peers to keep overnet connected (should be >2048) *)
-   max_known_peers = 8192
-
-	(* Size of the filename storage used to answer queries *)
-   store_size = 2000
-
-	(* port for Kademlia *)
-   port = 2096
-}
-
-
-
-(*****************************************************************)
-(*                                                               *)
-(*                       ADVANCED OPTIONS                        *)
-(*                                                               *)
-(*        All the options after this line are for the expert     *)
-(*        user. Do not modify them if you are not   sure.        *)
-(*                                                               *)
-(*****************************************************************)
-
-
-
-
-
-    (************************************)
-    (* SECTION : Donkey FOR EXPERTS *)
-    (* Donkey options *)
-    (************************************)
-
-
-
-	(* Initial score for a new server *)
- initial_score = 5
-
-	(* Max number of UDP packets per round for eXtended Search *)
- max_xs_packets = 30
-
-	(* Max number of messages of Chat remembered *)
- max_dialog_history = 30
-
-	(* Delay used to request file sources *)
- check_client_connections_delay = 180.
-
-	(* The delay between server connection rounds *)
- check_connections_delay = 5.
-
-	(* Timeout on client connections when not queued *)
- client_timeout = 40.
-
-	(* The number of UDP packets you send every check_client_connections_delay *)
- max_udp_sends = 10
-
-	(* Set this option to false if you don't want mldonkey
-	    to change the master servers it is connected to *)
- keep_best_server = true
-
-	(* only servers which are set to 'preferred' will be connected, 
-	  please note that any server must be set to preferred to use this feature *)
- connect_only_preferred_server = false
-
-	(* Number of servers that can be used to walk
-	between servers *)
- max_walker_servers = 1
-
-	(* The maximal delay a connection with a server should last when walking
-	through the list (should be greater than become_master_delay) *)
- walker_server_lifetime = 300
- log_clients_on_console = false
-
-	(* Allow mldonkey to propagate your sources to other donkey clients *)
- propagate_sources = true
- black_list = true
-
-	(* A list of ports that specify servers to remove
-	    from server list. Servers with ports on this list can't be added, and
-	    will eventually be removed *)
- port_black_list = []
-
-	(* How long should we wait in the queue of another client *)
- queued_timeout = 1800.
-
-	(* How long can a silent client stay in the upload queue *)
- upload_timeout = 1800.
-
-	(* How long a downloading client can stay in my upload queue (in minutes >5) *)
- upload_lifetime = 90
-
-	(* Each client upload lifetime depends on download-upload ratio *)
- dynamic_upload_lifetime = false
-
-	(* Uploaded zones (1 zone = 180 kBytes) needed to enable the dynamic upload lifetime *)
- dynamic_upload_threshold = 10
-
-	(* How long can a silent server stay connected *)
- connected_server_timeout = 1800.
-
-	(* The weight of upload on a donkey connection compared to upload on other
-	  peer-to-peer networks. Setting it to 5 for example means that a donkey
-	  connection will be allowed to send 5 times more information per second than
-	  an Open Napster connection. This is done to favorise donkey connections
-	  over other networks, where upload is less efficient, without preventing
-	  upload from these networks. *)
- upload_power = 5
-
-	(* max number of days after which an unconnected server is removed *)
- max_server_age = 2
-
-	(* How often should remove old donkey servers (see max_server_age) be called
-	   (in seconds, 0 to disable) *)
- remove_old_servers_delay = 900.
-
-	(* Minimal number of servers remaining after remove_old_servers *)
- min_left_servers = 20
-
-	(* How often should we check all servers (minimum 4 hours, 0 to disable) *)
- servers_walking_period = 6
-
-	(* Are the cancelled files added to the old files list to prevent re-download ? *)
- keep_cancelled_in_old_files = false
-
-	(* Are the downloaded files added to the old files list to prevent re-download ? *)
- keep_downloaded_in_old_files = false
-
-	(* true if you want your mldonkey to lose some
-	upload bandwidth sending messages to clients which are banned :) *)
- send_warning_messages = false
-
-	(* true if you want your client to ban
-	    clients that try queue jumping (3 reconnections faster than 9 minutes) *)
- ban_queue_jumpers = true
-
-	(* true if you want your client IP to be set from servers ID *)
- use_server_ip = true
-
-	(* Set the number of hours you want client to remain banned *)
- ban_period = 1
-
-	(* Set the maximal rank of a client to be kept as a client *)
- good_client_rank = 500
-
-	(* (only for development tests) *)
- immediate_master = false
-
-	(* (only for development tests) *)
- become_master_delay = 120
-
-	(* (internal option) *)
- options_version = 1
-
-(*
- The following options are not used (errors, obsolete, ...) 
-*)
diff --git a/config/mldonkey/old_config/downloads.ini b/config/mldonkey/old_config/downloads.ini
deleted file mode 100644
index e20fe764b..000000000
--- a/config/mldonkey/old_config/downloads.ini
+++ /dev/null
@@ -1,983 +0,0 @@
-
-
-    (************************************)
-    (*   Never edit options files when  *)
-    (*       the daemon is running      *)
-    (************************************)
-    (* SECTION : Main *)
-    (* Main options *)
-    (************************************)
-
-
-
-	(* small name of client *)
- client_name = sujetj
-
-
-    (************************************)
-    (* SECTION : Interfaces *)
-    (* Options to control ports used by mldonkey interfaces *)
-    (************************************)
-
-
-
-	(* list of IP address allowed to connect to the core via telnet/GUI/WEB
-	for internal command set: list separated by spaces
-	example for internal command: set allowed_ips "127.0.0.1 192.168.1.2"
-	or for editing the ini-file: list separated by semi-colon
-	example for ini-file: allowed_ips = [ "127.0.0.1"; "192.168.1.2";]
-	wildcard=255 ie: use 192.168.0.255 for 192.168.0.* *)
- allowed_ips = [
-  "127.0.0.1";]
-
-	(* port for Graphical Interfaces *)
- gui_port = 4001
-
-	(* port for GiFT Graphical Interfaces interaction. It was 1213, but the default is
-	now 0 for disabled, because it does not check for a password. *)
- gift_port = 0
-
-	(* The port used to connect to your client with a WEB browser *)
- http_port = 4080
-
-	(* port for user interaction *)
- telnet_port = 4000
-
-	(* Aliases to commands. The alias (fist string) has to be
-	whitespaceless, the outcome of the alias (second string)
-	may have spaces (put it in quotation then). *)
- alias_commands = [
-  (quit, q);
-  (exit, q);]
-
-
-    (************************************)
-    (* SECTION : Bandwidth *)
-    (*  *)
-    (************************************)
-
-
-
-	(* The maximal upload rate you can tolerate on your link in kBytes/s (0 = no limit)
-	  The limit will apply on all your connections (clients and servers) and both
-	control and data messages. *)
- max_hard_upload_rate = 10
-
-	(* The maximal download rate you can tolerate on your link in kBytes/s (0 = no limit)
-	  The limit will apply on all your connections (clients and servers) and both
-	control and data messages. *)
- max_hard_download_rate = 50
-
-	(* Maximal number of opened connections *)
- max_opened_connections = 200
-
-	(* Amount of indirect connections in percent (min 30, max 70) of max_opened_connections *)
- max_indirect_connections = 30
-
-	(* How many slots can be used for upload *)
- max_upload_slots = 5
-
-	(* Set aside a single reserved slot to upload to friends *)
- friends_upload_slot = true
-
-	(* Maximum file size to benefit from the reserved slot for small files (0 to disable) *)
- small_files_slot_limit = 10240
-
-	(* Set this to true if you want to have dynamic upload slot allocation (experimental) *)
- dynamic_slots = false
-
-	(* Maximal number of connections that can be opened per second *)
- max_connections_per_second = 5
-
-	(* list of IP addresses allowed to connect to the core with no limit on
-	upload/download and upload slots.  List separated by spaces, wildcard=255
-	ie: use 192.168.0.255 for 192.168.0.*  *)
- nolimit_ips = [
-  "127.0.0.1";]
-
-	(* This option enables MLdonkey to always read as much data as possible
-	  from a channel, but use more CPU as it must then copy the data in the
-	    channel buffer. *)
- copy_read_buffer = true
-
-
-    (************************************)
-    (* SECTION : Networks *)
-    (* Networks options *)
-    (************************************)
-
-
-
-	(* Set to true if you also want mldonkey to run as an overnet client
-	   (enable_donkey must be true) *)
- enable_overnet = true
-
-	(* Set to true if you also want mldonkey to run as an kademlia client
-	   (enable_donkey must be true, and only experimental) *)
- enable_kademlia = false
-
-	(* Set to true if you want mldonkey to connect to edonkey servers
-	   (enable_donkey must be true, and only experimental) *)
- enable_servers = true
-
-	(* Set to true if you also want mldonkey to run as an Bittorrent client *)
- enable_bittorrent = true
-
-	(* Set to true if you also want mldonkey to run as a donkey client *)
- enable_donkey = true
-
-	(* Set to true if you also want mldonkey to run as a napster client (experimental) *)
- enable_opennap = false
-
-	(* Set to true if you also want mldonkey to run as a soulseek client (experimental) *)
- enable_soulseek = false
-
-	(* Set to true if you also want mldonkey to run as a gnutella1 sub node (experimental) *)
- enable_gnutella = false
-
-	(* Set to true if you also want mldonkey to run as a gnutella2 sub node (experimental) *)
- enable_gnutella2 = false
-
-	(* Set to true if you also want mldonkey to run as a Fasttrack sub node (experimental) *)
- enable_fasttrack = false
-
-	(* Set to true if you also want mldonkey to run as a direct-connect node (experimental) *)
- enable_directconnect = false
-
-	(* Set to true if you also want mldonkey to download HTTP files (experimental) *)
- enable_fileTP = true
-
-
-    (************************************)
-    (* SECTION : Network Config *)
-    (* Network config options *)
-    (************************************)
-
-
-
-	(* The last IP address used for this client *)
- client_ip = "127.0.0.1"
-
-	(* Use the IP specified by 'client_ip' instead of trying to determine it
-	    ourself. Don't set this option to true if you have dynamic IP. *)
- force_client_ip = false
-
-	(* User agent string (default = "default") *)
- user_agent = default
-
-	(* A list of lines to download on the WEB: each line has
-	    the format: (kind, period, url), where kind is either
-	    'server.met' for a server.met file (also in gz/bz2/zip format)
-	                 containing ed2k server, or
-	    'comments.met' for a file of comments, or
-	    'guarding.p2p' for a blocklist file (also in gz/bz2/zip format), or
-	    'ocl' for file in the ocl format containing overnet peers, or
-	    'contact.dat' for an contact.dat file containing overnet peers,
-	    'nodes.gzip' for a fasttrack nodes.gzip,
-	    and period is the period between updates (in hours),
-	    a period of zero means the file is only loaded once on startup,
-	    and url is the url of the file to download.
-	    IMPORTANT: Put the URL and the kind between quotes.
-	    EXAMPLE:
-	 web_infos = [
-	  ("server.met", 0, "http://www.jd2k.com/server.met");
-	  ("guarding.p2p", 96, "http://www.bluetack.co.uk/config/level1.gz");
-	  ("ocl", 24, "http://members.lycos.co.uk/appbyhp2/FlockHelpApp/contact-files/contact.ocl");
-	  ("contact.dat", 168, "http://download.overnet.org/contact.dat");
-	 ]
-	   *)
- web_infos = [
-  ("guarding.p2p", 96, "http://www.bluetack.co.uk/config/level1.gz");
-  ("server.met", 0, "http://www.jd2k.com/server.met");
-  ("contact.dat", 168, "http://download.overnet.org/contact.dat");
-  ("geoip.dat", 0, "http://www.maxmind.com/download/geoip/database/GeoIP.dat.gz");
-  ("nodes.gzip", 0, "http://update.kceasy.com/update/fasttrack/nodes.gzip");]
-
-	(* Cookies send with a http request (used for .torrent files and web_infos) *)
- referers = [
-  (".*suprnova.*", "http://www.suprnova.org/");]
-
-	(* Cookies send with a http request (used for .torrent files and web_infos) *)
- cookies = []
-
-	(* Direct HTTP queries to HTTP proxy *)
- http_proxy_server = ""
-
-	(* Port of HTTP proxy *)
- http_proxy_port = 8080
-
-	(* Direct TCP connections to HTTP proxy (the proxy should support CONNECT) *)
- http_proxy_tcp = false
-
-
-    (************************************)
-    (* SECTION : HTML mods *)
-    (* Options to configure HTML mode *)
-    (************************************)
-
-
-
-	(* bw_stats refresh delay (seconds) *)
- html_mods_bw_refresh_delay = 11
-
-	(* html_mods_theme to use (located in relative html_themes/<theme_name> directory
-	     leave blank to use internal theme *)
- html_mods_theme = ""
-
-
-    (************************************)
-    (* SECTION : Download *)
-    (* Download options *)
-    (************************************)
-
-
-
-	(* Set to false if you don't want mldonkey to automatically put completed files
-	   in incoming directory *)
- auto_commit = true
-
-	(* Set to true if you want all new downloads be paused immediatly
-	     will be set to false on core start. *)
- pause_new_downloads = false
-
-	(* The maximal number of files in Downloading state (other ones are Queued) *)
- max_concurrent_downloads = 50
-
-	(* The maximal length of zero bytes between non-zero bytes in a file that
-	should be interpreted as downloaded during a recovery *)
- max_recover_zeroes_gap = 16
-
-	(* A command that is called when a file is committed, does not work on MinGW.
-	    Arguments are (kept for compatability):
-	      $1 - temp file name, without path
-	      $2 - file size
-	      $3 - filename of the committed file
-	    Also these environment variables can be used (prefered way):
-	      $TEMPNAME  - temp file name, including path
-	      $FILEID    - same as $1
-	      $FILESIZE  - same as $2
-	      $FILENAME  - same as $3
-	      $FILEHASH  - internal hash
-	      $DURATION  - download duration
-	      $INCOMING  - directory used for commit
-	      $NETWORK   - network used for downloading
-	      $ED2K_HASH - ed2k hash if MD4 is known *)
- file_completed_cmd = ""
-
-	(* The command which is called when a download is started. Arguments
-	are '-file <num>' *)
- file_started_cmd = ""
-
-
-    (************************************)
-    (* SECTION : Startup *)
-    (* Startup options *)
-    (************************************)
-
-
-
-	(* The login of the user you want mldonkey to run as, after the ports
-	  have been bound (can be use not to run with root priviledges when
-	a port < 1024 is needed) *)
- run_as_user = ""
-
-	(* The UID of the user (0=disabled) you want mldonkey to run as, after the ports
-	  have been bound (can be use not to run with root priviledges when
-	a port < 1024 is needed) *)
- run_as_useruid = 0
-
-	(* Ask for GUI start *)
- ask_for_gui = false
-
-	(* Automatically Start the GUI *)
- start_gui = false
-
-	(* Should MLdonkey try to recover downloads of files in temp/ at startup *)
- recover_temp_on_startup = true
-
-
-    (************************************)
-    (* SECTION : Mail *)
-    (* Mail options *)
-    (************************************)
-
-
-
-	(* The mail server you want to use (must be SMTP). Use hostname or IP address *)
- smtp_server = "127.0.0.1"
-
-	(* The port to use on the mail server (default 25) *)
- smtp_port = 25
-
-	(* Your e-mail if you want to receive mails when downloads are completed *)
- mail = ""
-
-	(* Does your mail-server need <...> around addresses *)
- add_mail_brackets = false
-
-	(* Send filename in mail subject *)
- filename_in_subject = true
-
-	(* Put a prefix for the filename here which shows up in the notification mail *)
- url_in_mail = ""
-
-
-    (************************************)
-    (* SECTION : Paths *)
-    (* Paths options *)
-    (************************************)
-
-
-
-	(* The directory where temporary files should be put *)
- temp_directory = temp
-
-	(* New directories in incoming_directories are created with these rights *)
- create_dir_mask = 755
-
-	(* Create new files as sparse, only valid on MinGW for files on NTFS drives *)
- create_file_sparse = true
-
-	(* Mininum free space in MB on temp_directory, minimum 50 *)
- hdd_temp_minfree = 50
-
-	(* If true core shuts down when free space on temp dir is below hdd_temp_minfree,
-	    otherwise all downloads are paused and a warning email is sent. *)
- hdd_temp_stop_core = false
-
-	(* Mininum free space in MB on core directory, minimum 20 *)
- hdd_coredir_minfree = 50
-
-	(* If true core shuts down when free space on core dir is below hdd_coredir_minfree,
-	    otherwise all downloads are paused and a warning email is sent. *)
- hdd_coredir_stop_core = true
-
-	(* Send a warning mail each <interval> hours for each directory, 0 to deactivate mail warnings. *)
- hdd_send_warning_interval = 1
-
-	(*                 Incoming and shared directories.
-	   At least two entries have to be present here, one with strategy
-	   incoming_files and one with strategy incoming_directories.
-	   Both entries can point to the same directory.
-	   If one of the two strategies is missing, MLDonkey will create a default
-	   directory with its entry here.
-	   Finished BT multifile downloads are committed to the first directory
-	   with strategy incoming_directories. Other downloads are committed
-	   to the first directory with the strategy incoming_files.
-	   If more than one directory has one of the incoming_* strategies
-	   it will be ignored on commit, but they are shared nonetheless.
-	   Other strategies can be found in searches.ini, section customized_sharing. *)
- shared_directories = [
-  {     dirname = shared
-     networks = []
-     strategy = all_files
-     priority = 0
-};
-  {     dirname = "incoming/files"
-     networks = []
-     strategy = incoming_files
-     priority = 0
-};
-  {     dirname = "incoming/directories"
-     networks = []
-     strategy = incoming_directories
-     priority = 0
-};]
-
-
-    (************************************)
-    (* SECTION : Security *)
-    (* Security options *)
-    (************************************)
-
-
-
-	(* Commands that you are allowed to be call from the interface. These
-	commands should short, so that the core is not blocked more than necessary. *)
- allowed_commands = [
-  (df, df);
-  (ls, "ls incoming");]
-
-	(* Allow you to use any command with ! in the interface instead of only the
-	ones in allowed_commands *)
- allow_any_command = false
-
-	(* Are all users allowed to change MLDonkey options? *)
- enable_user_config = true
-
-	(* Allow others to browse our share list (0: none, 1: friends only, 2: everyone *)
- allow_browse_share = 1
-
-	(* Regexp of messages to filter out, example: string1|string2|string3 *)
- messages_filter = "Your client is connecting too fast"
-
-
-    (************************************)
-    (* SECTION : Other *)
-    (* Other options *)
-    (************************************)
-
-
-
-	(* (experimental) *)
- save_results = 0
-
-	(* filters on replies (replies will be kept). *)
- filters = ""
-
-	(* Buffer writes and flush after buffer_writes_delay seconds (experimental) *)
- buffer_writes = false
-
-	(* build statistics about eMule mods *)
- emule_mods_count = false
-
-	(* show all eMule mods in statistics *)
- emule_mods_showall = false
-
-	(* How often (in hours) should a backup of the ini files be written into old_config.
-	  A value of zero means that a backup is written only when the core shuts down. *)
- backup_options_delay = 0
-
-	(* Define the total number of options archives in old_config. *)
- backup_options_generations = 10
-
-	(* Define the format of the archive, zip or tar.gz are valid. *)
- backup_options_format = "tar.gz"
-
-	(* The maximum time in seconds to wait for networks to cleanly shutdown. *)
- shutdown_timeout = 3
-
-	(* The IP address used to bind the p2p clients *)
- client_bind_addr = "0.0.0.0"
-
-
-
-(*****************************************************************)
-(*                                                               *)
-(*                       ADVANCED OPTIONS                        *)
-(*                                                               *)
-(*        All the options after this line are for the expert     *)
-(*        user. Do not modify them if you are not   sure.        *)
-(*                                                               *)
-(*****************************************************************)
-
-
-
-
-
-    (************************************)
-    (* SECTION : Interfaces FOR EXPERTS *)
-    (* Options to control ports used by mldonkey interfaces *)
-    (************************************)
-
-
-
-	(* The IP address used to bind the http server *)
- http_bind_addr = "0.0.0.0"
-
-	(* The IP address used to bind the gui server *)
- gui_bind_addr = "0.0.0.0"
-
-	(* The IP address used to bind the telnet server *)
- telnet_bind_addr = "0.0.0.0"
-
-	(* Should *all* sources for a file be shown on HTML/telnet vd <num> *)
- print_all_sources = true
-
-	(* Improved telnet interface *)
- improved_telnet = true
-
-	(* A space-separated list of keywords. Each keyword triggers
-	  printing information on the corresponding messages:
-	  verb : verbose mode (interesting not only for coders)
-	  mc : debug client messages
-	  mr|raw : debug raw messages
-	  mct : debug emule clients tags
-	  ms : debug server messages
-	  sm : debug source management
-	  net : debug net
-	  gui : debug gui
-	  no-login : disable login messages
-	  file : debug file handling
-	  do : some download warnings
-	  up : some upload warnings
-	  unk : unknown messages
-	  ov : overnet
-	  loc : debug source research/master servers
-	  share: debug sharing
-	  md4 : md4 computation
-	  connect : debug connections
-	  udp : udp messages
-	  ultra|super : debug supernode
-	  swarming : debug swarming
-	  hc : http_client messages
-	  hs : http_server messages
-	  act : debug activity
-	  bw : debug bandwidth
-	  unexp : debug unexpected messages
-	 *)
- verbosity = ""
-
-
-    (************************************)
-    (* SECTION : Bandwidth FOR EXPERTS *)
-    (*  *)
-    (************************************)
-
-
-
-	(* The delay in milliseconds to wait in the event loop. Can be decreased to
-	increase the bandwidth usage, or increased to lower the CPU usage. *)
- loop_delay = 20
-
-
-    (************************************)
-    (* SECTION : Networks FOR EXPERTS *)
-    (* Networks options *)
-    (************************************)
-
-
-
-	(* Set to true if you also want mldonkey to run as a OpenFT sub node (experimental) *)
- enable_openft = false
-
-
-    (************************************)
-    (* SECTION : Network Config FOR EXPERTS *)
-    (* Network config options *)
-    (************************************)
-
-
-
-	(* URLs of RSS feeds *)
- rss_feeds = []
-
-	(* Keep IP blocking ranges descriptions in memory *)
- ip_blocking_descriptions = false
-
-	(* IP blocking list filename (peerguardian format), can also be in gz/bz2/zip format
-	  Zip files must contain either a file named guarding.p2p or guarding_full.p2p. *)
- ip_blocking = ""
-
-	(* List of countries to block connections from/to (requires Geoip).
-	  Names are in ISO 3166 format, see http://www.maxmind.com/app/iso3166
-	  You can also at your own risk use "Unknown" for IPs Geoip won't recognize. *)
- ip_blocking_countries = []
-
-	(* false: use ip_blocking_countries as block list, all other countries are allowed
-	  true: use ip_blocking_countries as allow list, all other countries are blocked *)
- ip_blocking_countries_block = false
-
-	(* Location of GeoIP.dat (Get one from http://www.maxmind.com/download/geoip/database/) *)
- geoip_dat = ""
-
-	(* The size of the header of a TCP/IP packet on your connection (ppp adds
-	    14 bytes sometimes, so modify to take that into account) *)
- tcpip_packet_size = 40
-
-	(* The size of the MTU of a TCP/IP packet on your connection *)
- mtu_packet_size = 1500
-
-	(* The size of the frame packet on your network (on my cable link, it is 250) *)
- packet_frame_size = 250
-
-	(* The size of the minimal packet you want mldonkey to send when data is
-	available on the connection *)
- minimal_packet_size = 600
-
-	(* Should a connection check if the peer we are connected to is still alive?
-	  This implies some bandwidth-cost (with 200 connections ~10-20%) *)
- socket_keepalive = false
-
-
-    (************************************)
-    (* SECTION : HTML mods FOR EXPERTS *)
-    (* Options to configure HTML mode *)
-    (************************************)
-
-
-
-	(* Whether to use the modified WEB interface *)
- html_mods = true
-
-	(* Which html_mods style to use (set with html_mods_style command) *)
- html_mods_style = 0
-
-	(* Whether to use human readable GMk number format *)
- html_mods_human_readable = true
-
-	(* Whether to use relative availability in the WEB interface *)
- html_mods_use_relative_availability = true
-
-	(* Whether to display the Net column in vd output *)
- html_mods_vd_network = true
-
-	(* Whether to display the Active Sources column in vd output *)
- html_mods_vd_active_sources = true
-
-	(* Whether to display the Age column in vd output *)
- html_mods_vd_age = true
-
-	(* Show graph in vd output *)
- html_mods_vd_gfx = true
-
-	(* Remove graph files on core shutdown *)
- html_mods_vd_gfx_remove = false
-
-	(* Fill graph in vd output *)
- html_mods_vd_gfx_fill = true
-
-	(* Split download and upload graph in vd output *)
- html_mods_vd_gfx_split = false
-
-	(* Stacked download and upload graph *)
- html_mods_vd_gfx_stack = true
-
-	(* Flip up/side graph position in vd output *)
- html_mods_vd_gfx_flip = true
-
-	(* Show mean line on graph in vd output *)
- html_mods_vd_gfx_mean = true
-
-	(* Show transparent graph in vd output (only for png) *)
- html_mods_vd_gfx_transparent = true
-
-	(* Draw graph as png if true, else draw as jpg in vd output *)
- html_mods_vd_gfx_png = true
-
-	(* Show hourly graph in vd output *)
- html_mods_vd_gfx_h = true
-
-	(* Graph x size in vd output ( 320 < x < 3600 ) *)
- html_mods_vd_gfx_x_size = 630
-
-	(* Graph y size in vd output ( 200 < y < 1200 ) *)
- html_mods_vd_gfx_y_size = 200
-
-	(* Draw tag graph *)
- html_mods_vd_gfx_tag = false
-
-	(* Use tag source image  *)
- html_mods_vd_gfx_tag_use_source = false
-
-	(* Tag source image name *)
- html_mods_vd_gfx_tag_source = image
-
-	(* Draw tag as png if true, else draw as jpg in vd output *)
- html_mods_vd_gfx_tag_png = true
-
-	(* Enable tag graph title *)
- html_mods_vd_gfx_tag_enable_title = true
-
-	(* Tag graph title *)
- html_mods_vd_gfx_tag_title = "MLNet traffic"
-
-	(* Tag graph title x pos in vd output
-	     *)
- html_mods_vd_gfx_tag_title_x_pos = 4
-
-	(* Tag graph title y pos in vd output  *)
- html_mods_vd_gfx_tag_title_y_pos = 1
-
-	(* Tag graph download x pos in vd output  *)
- html_mods_vd_gfx_tag_dl_x_pos = 4
-
-	(* Tag graph download y pos in vd output  *)
- html_mods_vd_gfx_tag_dl_y_pos = 17
-
-	(* Tag graph upload x pos in vd output  *)
- html_mods_vd_gfx_tag_ul_x_pos = 4
-
-	(* Tag graph upload y pos in vd output  *)
- html_mods_vd_gfx_tag_ul_y_pos = 33
-
-	(* Tag graph x size in vd output ( 130 < x < 3600 ) *)
- html_mods_vd_gfx_tag_x_size = 80
-
-	(* Tag graph y size in vd output ( 50 < x < 1200 ) *)
- html_mods_vd_gfx_tag_y_size = 50
-
-	(* Whether to display the Last column in vd output *)
- html_mods_vd_last = true
-
-	(* Whether to display the Priority column in vd output *)
- html_mods_vd_prio = true
-
-	(* Whether to display the Queues in vd # output *)
- html_mods_vd_queues = true
-
-	(* Change height of download indicator bar in vd output *)
- html_vd_barheight = 2
-
-	(* Whether to display chunks list as graph or text in vd output *)
- html_vd_chunk_graph = true
-
-	(* Change style of chunk graph *)
- html_vd_chunk_graph_style = 0
-
-	(* Change max width of chunk graph *)
- html_vd_chunk_graph_max_width = 200
-
-	(* Whether to display the pending slots in uploaders command *)
- html_mods_show_pending = true
-
-	(* Whether to load the mldonkey_messages.ini file (false=use internal settings) *)
- html_mods_load_message_file = false
-
-	(* Maximum chat messages to log in memory *)
- html_mods_max_messages = 50
-
-	(* Whether to use checkboxes in the WEB interface for download list *)
- html_checkbox_vd_file_list = true
-
-	(* Whether to use checkboxes in the WEB interface for search result list *)
- html_checkbox_search_file_list = false
-
-	(* Use gzip compression on web pages *)
- html_use_gzip = false
-
-	(* Whether to use the fancy javascript tooltips or plain html-title *)
- html_mods_use_js_tooltips = true
-
-	(* How long to wait before displaying the tooltips *)
- html_mods_js_tooltips_wait = 0
-
-	(* How long to display the tooltips *)
- html_mods_js_tooltips_timeout = 100000
-
-	(* Use javascript to display option help text as js popup (true=use js, false=use html tables) *)
- html_mods_use_js_helptext = true
-
-
-    (************************************)
-    (* SECTION : Debug FOR EXPERTS *)
-    (* Debug options *)
-    (************************************)
-
-
-
-	(* If this option is set, IP addresses on the local network are allowed
-	(only for debugging) *)
- allow_local_network = false
-
-	(* size of log in number of records *)
- log_size = 300
-
-	(* Maximum size of log_file in MB *)
- log_file_size = 2
-
-	(* The file in which you want mldonkey to log its debug messages. If you
-	  set this option, mldonkey will log this info in the file until you use the
-	'close_log' command. The log file may become very large. You can
-	    also enable logging in a file after startup using the 'log_file' command. *)
- log_file = "mlnet.log"
-
-	(* number of lines for GUI console messages *)
- gui_log_size = 30
-
-
-    (************************************)
-    (* SECTION : Download FOR EXPERTS *)
-    (* Download options *)
-    (************************************)
-
-
-
-	(* Set to true if you want MLdonkey to emulate sparse files on your disk.
-	  Files will use less space, but <preview> and <recover> won't work anymore.
-	  Works only on Edonkey plugin. EXPERIMENTAL. *)
- emulate_sparsefiles = false
-
-	(* How many sources to use to download each chunk *)
- sources_per_chunk = 3
-
-	(* What algorithm to use to select blocks (currently 1 or 2) *)
- swarming_block_selection_algorithm = 1
-
-
-    (************************************)
-    (* SECTION : Startup FOR EXPERTS *)
-    (* Startup options *)
-    (************************************)
-
-
-
-	(* How many megabytes should MLdonkey keep for saving configuration files. *)
- config_files_security_space = 10
-
-
-    (************************************)
-    (* SECTION : Paths FOR EXPERTS *)
-    (* Paths options *)
-    (************************************)
-
-
-
-	(* Name of program used for preview (first arg is local filename, second arg
-	    is name of file as searched on eDonkey *)
- previewer = mldonkey_previewer
-
-	(* Directory where mldonkey binaries are installed *)
- mldonkey_bin = "."
-
-	(* Name of GUI to start *)
- mldonkey_gui = "./mlgui"
-
-
-    (************************************)
-    (* SECTION : MLChat FOR EXPERTS *)
-    (* MLChat options *)
-    (************************************)
-
-
-
-	(* port of the external chat application *)
- chat_app_port = 5036
-
-	(* hostname of the external chat application *)
- chat_app_host = localhost
-
-	(* port used by the external chat application to use the core as a proxy *)
- chat_port = 4002
-
-	(* The IP address used to bind the chat server *)
- chat_bind_addr = "0.0.0.0"
-
-	(* the id to use for communicating with the core console through chat interface *)
- chat_console_id = "donkey console"
-
-	(* use the chat to indicate when a file has been downloaded *)
- chat_warning_for_downloaded = true
-
-
-    (************************************)
-    (* SECTION : Other FOR EXPERTS *)
-    (* Other options *)
-    (************************************)
-
-
-
-	(* keep seen files in history to allow local search (can be expensive in memory) *)
- use_file_history = false
-
-	(* Buffer writes and flush after buffer_writes_delay seconds (experimental) *)
- buffer_writes_delay = 30.
-
-	(* Flush buffers if buffers exceed buffer_writes_threshold kB (experimental) *)
- buffer_writes_threshold = 1024
-
-	(* The conversions to apply on Unicode characters *)
- utf8_filename_conversions = []
-
-	(* The size of the buffer between the client and its GUI. Can be useful
-	to increase when the connection between them has a small bandwith *)
- interface_buffer = 1000000
-
-	(* The size long names will be shortened to in the interface *)
- max_name_len = 50
-
-	(* The size long client names will be shortened to in the interface *)
- max_client_name_len = 25
-
-	(* Is the default terminal an ANSI terminal (escape sequences can be used) *)
- term_ansi = true
-
-	(* Delay between updates to the GUI *)
- update_gui_delay = 1.
-
-	(* The realm shown when connecting with a WEB browser *)
- http_realm = MLdonkey
-
-	(* This option controls whether the WEB interface should use frames or not *)
- use_html_frames = true
-
-	(* This option controls whether the WEB interface should show frame borders or not *)
- html_frame_border = true
-
-	(* The height of the command frame in pixel (depends on your screen and browser sizes) *)
- commands_frame_height = 46
-
-	(* Force compaction every <n> hours (in [1..24]) *)
- compaction_delay = 2
-
-	(* The delay between reloads of the vd output in the WEB interface *)
- vd_reload_delay = 120
-
-	(* (experimental) *)
- dp500_pclink = false
-
-	(* (experimental) *)
- dp500_port = 8000
-
-	(* (experimental) *)
- dp500_buffer = 2000000
-
-	(* (experimental) *)
- dp500_directory = dp500
-
-	(* Should the MLSUBMIT.REG file be created *)
- create_mlsubmit = true
-
-	(* Size of the minor heap in kB *)
- minor_heap_size = 32
-
-	(* The source queues to display in source lists (see 'sources' command) *)
- relevant_queues = [
-  0;
-  1;
-  2;
-  3;
-  4;
-  5;
-  6;
-  8;
-  9;
-  10;]
-
-	(* The minimal delay between two connections to the same client (in seconds) *)
- min_reask_delay = 600
-
-	(* Whether to display results already downloaded *)
- display_downloaded_results = true
-
-	(* Minimal number of results for filter form to appear *)
- filter_table_threshold = 50
-
-	(* Maximal size of the buffers of a client *)
- client_buffer_size = 500000
-
-	(* The delay between two saves of the 'downloads.ini' file (default is 15 minutes).
-	    Changes to this option require a core restart. *)
- save_options_delay = 900.
-
-	(* timeout when connecting to a server *)
- server_connection_timeout = 30.
-
-	(* The delay between one glance at a file and another *)
- download_sample_rate = 1.
-
-	(* How many samples go into an estimate of transfer rates *)
- download_sample_size = 10
-
-	(* This option defines a set of date at which some commands have to be executed.
-	  For each tuple, the first argument is a list of week days (from 0 to 6),
-	  the second is a list of hours (from 0 to 23) and the last one a command to
-	  execute. Can be used with 'pause all' and 'resume all' for example to
-	  resume and pause downloads automatically for the night. *)
- calendar = []
-
-	(* The percentage of free memory before a compaction is triggered *)
- compaction_overhead = 25
-
-	(* The major GC speed is computed from this parameter. This is the memory
-	    that will be "wasted" because the GC does not immediatly collect 
-	    unreachable blocks. It is expressed as a percentage of the memory used
-	    for live data. The GC will work more (use more CPU time and collect 
-	    blocks more eagerly) if space_overhead is smaller. *)
- space_overhead = 80
-
-	(* Maximal number of results displayed for a search *)
- max_displayed_results = 1000
-
-	(* (internal option) *)
- options_version = 13
diff --git a/config/mldonkey/old_config/fileTP.ini b/config/mldonkey/old_config/fileTP.ini
deleted file mode 100644
index 3618b8ba1..000000000
--- a/config/mldonkey/old_config/fileTP.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-    (************************************)
-    (*   Never edit options files when  *)
-    (*       the daemon is running      *)
-    (************************************)
-    (* SECTION : FileTP *)
-    (* FileTP options *)
-    (************************************)
-
-
-
-	(* A list of lists, where each list contains equivalent prefixes for mirrors *)
- mirrors = []
-
-	(* A list of (hostname, args). Example: [  ( "mycomputer.mydomain.fr", (ssh, "mldonkey@mycomputer.mydomain.fr") ) ] *)
- remote_shells = []
-
-	(* The command to call to get a range *)
- get_range = get_range
-
-	(* The argument to !!get_range to get a range *)
- range_arg = range
-
-	(* (internal option) *)
- options_version = 0
-
-	(* Chunk size (in bytes) (0 = No chunks) *)
- chunk_size = 0
- old_urls = []
-
-(*
- The following options are not used (errors, obsolete, ...) 
-*)
diff --git a/config/mldonkey/old_config/files.ini b/config/mldonkey/old_config/files.ini
deleted file mode 100644
index ed06f2dfe..000000000
--- a/config/mldonkey/old_config/files.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-
-	(* All the swarmers used *)
- swarmers = []
-
-	(* The files whose download is finished *)
- done_files = []
-
-	(* The files currently being downloaded, primary downloads must come first *)
- files = []
-
-(*
- The following options are not used (errors, obsolete, ...) 
-*)
diff --git a/config/mldonkey/old_config/friends.ini b/config/mldonkey/old_config/friends.ini
deleted file mode 100644
index 9c654ac73..000000000
--- a/config/mldonkey/old_config/friends.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-
-	(* The list of known friends *)
- friends = []
-
-(*
- The following options are not used (errors, obsolete, ...) 
-*)
diff --git a/config/mldonkey/old_config/searches.ini b/config/mldonkey/old_config/searches.ini
deleted file mode 100644
index 67e9977a2..000000000
--- a/config/mldonkey/old_config/searches.ini
+++ /dev/null
@@ -1,94 +0,0 @@
-
-	(* Maximal number of saved searches *)
- max_saved_searches = 10
- customized_queries = [
-  ("Complex Search", [
-      AND;
-      (KEYWORDS, keywords, "");
-      (MODULE, "Simple Options", [
-          AND;
-          (MINSIZE, "Min Size", "");
-          (MAXSIZE, "Max Size", "");
-          (MEDIA, Media, "");
-          (FORMAT, Format, "")]);
-      (MODULE, "Mp3 Options", [
-          AND;
-          (MP3_ARTIST, Artist, "");
-          (MP3_ALBUM, Album, "");
-          (MP3_TITLE, Title, "");
-          (MP3_BITRATE, "Min Bitrate", "")])]);
-  ("MP3 Search", [
-      AND;
-      (KEYWORDS, keywords, "");
-      (MP3_ARTIST, Artist, "");
-      (MP3_ALBUM, Album, "");
-      (MP3_TITLE, Title, "");
-      (MP3_BITRATE, "Min Bitrate", "");
-      [
-        HIDDEN;
-        (MEDIA, Media, Audio);
-        (FORMAT, Format, mp3)]]);
-  ("Movie Search", [
-      AND;
-      (KEYWORDS, keywords, "");
-      [
-        HIDDEN;
-        (MINSIZE, "Min Size", 500000000);
-        (MEDIA, Media, Video);
-        (FORMAT, Format, avi)]]);
-  ("Album Search", [
-      AND;
-      (KEYWORDS, Keywords, album);
-      [
-        HIDDEN;
-        (ANDNOT, (MINSIZE, "Min Size", 30000000), (FORMAT, Format, mp3))]]);]
-
-	(* Shortcuts for special specialized searches *)
- special_queries = [
-  ("-1cd", "-maxsize 735000000");
-  ("-movies", "avi -minsize 650000000 -1cd");
-  ("-mp3s", "mp3 -minsize 3000000 -maxsize 10000000");
-  ("-albums", "album -minsize 30000000 -maxsize 150000000");
-  ("-nosex", "-without xxx");]
- customized_sharing = [
-  (mp3s, {       recursive = true
-       extensions = [
-        ".mp3";]
-       minsize = 0
-       maxsize = 10485760
-});
-  (avis, {       recursive = true
-       extensions = [
-        ".avi";]
-       minsize = 524288000
-       maxsize = 9223372036854775807
-});
-  (all_files, {       recursive = true
-       extensions = []
-       minsize = 1
-       maxsize = 9223372036854775807
-});
-  (incoming_files, {       incoming = true
-       extensions = []
-       minsize = 1
-       maxsize = 9223372036854775807
-});
-  (incoming_directories, {       incoming = true
-       directories = true
-       extensions = []
-       minsize = 1
-       maxsize = 9223372036854775807
-});
-  (only_directory, {       extensions = []
-       minsize = 1
-       maxsize = 9223372036854775807
-});
-  (directories, {       directories = true
-       extensions = []
-       minsize = 1
-       maxsize = 9223372036854775807
-});]
-
-(*
- The following options are not used (errors, obsolete, ...) 
-*)
diff --git a/config/mldonkey/old_config/servers.ini b/config/mldonkey/old_config/servers.ini
deleted file mode 100644
index ca19972bd..000000000
--- a/config/mldonkey/old_config/servers.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-
-	(* List of known servers *)
- known_servers = []
- Overnet = {
-
-	(* List of IP addresses to use to boot Kademlia networks *)
-   boot_peers = []
-}
- Kademlia = {
-
-	(* List of IP addresses to use to boot Kademlia networks *)
-   boot_peers = []
-}
-
-(*
- The following options are not used (errors, obsolete, ...) 
-*)
diff --git a/config/mldonkey/old_config/shared_files.ini b/config/mldonkey/old_config/shared_files.ini
deleted file mode 100644
index 834e5064f..000000000
--- a/config/mldonkey/old_config/shared_files.ini
+++ /dev/null
@@ -1,5 +0,0 @@
- shared_files = []
-
-(*
- The following options are not used (errors, obsolete, ...) 
-*)
diff --git a/config/mldonkey/old_config/shared_files_new.ini b/config/mldonkey/old_config/shared_files_new.ini
deleted file mode 100644
index 834e5064f..000000000
--- a/config/mldonkey/old_config/shared_files_new.ini
+++ /dev/null
@@ -1,5 +0,0 @@
- shared_files = []
-
-(*
- The following options are not used (errors, obsolete, ...) 
-*)
diff --git a/config/mldonkey/old_config/stats.ini b/config/mldonkey/old_config/stats.ini
deleted file mode 100644
index d82d834d7..000000000
--- a/config/mldonkey/old_config/stats.ini
+++ /dev/null
@@ -1,96 +0,0 @@
- guptime = 0
- stats = [
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};]
-
-(*
- The following options are not used (errors, obsolete, ...) 
-*)
diff --git a/config/mldonkey/old_config/stats_bt.ini b/config/mldonkey/old_config/stats_bt.ini
deleted file mode 100644
index 86a7ea352..000000000
--- a/config/mldonkey/old_config/stats_bt.ini
+++ /dev/null
@@ -1,342 +0,0 @@
- guptime = 0
- stats = [
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};
-  {     seen = 0
-     banned = 0
-     filereqs = 0
-     download = 0
-     upload = 0
-};]
-
-(*
- The following options are not used (errors, obsolete, ...) 
-*)
diff --git a/config/mldonkey/old_config/stats_mod.ini b/config/mldonkey/old_config/stats_mod.ini
deleted file mode 100644
index 828884541..000000000
--- a/config/mldonkey/old_config/stats_mod.ini
+++ /dev/null
@@ -1,683 +0,0 @@
- stats = [
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};
-  {     mseen = 0
-     mbanned = 0
-     mfilereqs = 0
-     mdownload = 0
-     mupload = 0
-};]
-
-(*
- The following options are not used (errors, obsolete, ...) 
-*)
diff --git a/config/mldonkey/old_config/users.ini b/config/mldonkey/old_config/users.ini
deleted file mode 100644
index 0733d2a9f..000000000
--- a/config/mldonkey/old_config/users.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-    (************************************)
-    (*   Never edit options files when  *)
-    (*       the daemon is running      *)
-    (************************************)
-    (* SECTION : Users *)
-    (* User accounts on the core *)
-    (************************************)
-
-
-
-	(* Depreciated option, kept for compatibility reasons - used by MLDonkey < 2.7.5 *)
- users = [
-  (admin, "31D6CFE0D16AE931B73C59D7E0C089C0");]
-
-
-    (************************************)
-    (* SECTION : Users *)
-    (* User accounts on the core (new format) *)
-    (************************************)
-
-
-
-	(* The users that are defined on this core. The default user is
-	called 'admin', and uses an empty password. To create new users,
-	login as admin in mldonkey, and use the 'useradd' command. *)
- users2 = [
-  {     user_name = admin
-     user_pass = "31D6CFE0D16AE931B73C59D7E0C089C0"
-     user_mail = ""
-};
-  {     user_name = admin
-     user_pass = "31D6CFE0D16AE931B73C59D7E0C089C0"
-     user_mail = ""
-};]
diff --git a/config/mldonkey/statistics.ini b/config/mldonkey/statistics.ini
new file mode 100644
index 000000000..d401ad76f
--- /dev/null
+++ b/config/mldonkey/statistics.ini
@@ -0,0 +1,17 @@
+
+
+    (************************************)
+    (*   Never edit options files when  *)
+    (*       the daemon is running      *)
+    (************************************)
+    (* SECTION : Country statistics *)
+    (* Country-based traffic statistics *)
+    (************************************)
+
+
+ guptime = 15
+ country_stats = []
+
+(*
+ The following options are not used (errors, obsolete, ...) 
+*)
diff --git a/config/mldonkey/stats.ini b/config/mldonkey/stats.ini
index c1879fe4a..1eff38771 100644
--- a/config/mldonkey/stats.ini
+++ b/config/mldonkey/stats.ini
@@ -1,4 +1,4 @@
- guptime = 1
+ guptime = 16
  stats = [
   {     seen = 0
      banned = 0
@@ -89,6 +89,18 @@
      filereqs = 0
      download = 0
      upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
 };]
 
 (*
diff --git a/config/mldonkey/stats_bt.ini b/config/mldonkey/stats_bt.ini
index b6288f5cd..37ab5a2a2 100644
--- a/config/mldonkey/stats_bt.ini
+++ b/config/mldonkey/stats_bt.ini
@@ -1,4 +1,4 @@
- guptime = 1
+ guptime = 16
  stats = [
   {     seen = 0
      banned = 0
@@ -335,6 +335,132 @@
      filereqs = 0
      download = 0
      upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
+};
+  {     seen = 0
+     banned = 0
+     filereqs = 0
+     download = 0
+     upload = 0
 };]
 
 (*
diff --git a/config/mldonkey/users.ini b/config/mldonkey/users.ini
index 9083d7cd3..43782c824 100644
--- a/config/mldonkey/users.ini
+++ b/config/mldonkey/users.ini
@@ -5,7 +5,46 @@
     (*       the daemon is running      *)
     (************************************)
     (* SECTION : Users *)
-    (* User accounts on the core *)
+    (* User accounts on the core (new format) *)
+    (************************************)
+
+
+
+	(* The groups that are defined on this core.
+	
+	group_admin           = Are members of this group MLDonkey admins?
+	                        Only members of this group can change settings and see uploads.
+	 *)
+ groups = [
+  {     group_name = mldonkey
+     group_admin = true
+};]
+
+	(* The users that are defined on this core. The default user is
+	called 'admin', and uses an empty password. To create new users,
+	login as admin in mldonkey, and use the 'useradd' command.
+	
+	user_groups                   = Files belonging to one of these groups can be seen by the user.
+	user_default_group            = New downloads by this user will belong to this group.
+	user_commit_dir               = Commit files to <incoming>/<user_commit_dir>
+	user_mail                     = Address used to sent confirmation mails after comitting a download
+	user_max_concurrent_downloads = Maximum number of downloads allowed, 0 = unlimited
+	 *)
+ users2 = [
+  {     user_name = admin
+     user_pass = "31D6CFE0D16AE931B73C59D7E0C089C0"
+     user_groups = [
+      mldonkey;]
+     user_default_group = mldonkey
+     user_mail = ""
+     user_commit_dir = ""
+     user_max_concurrent_downloads = 0
+};]
+
+
+    (************************************)
+    (* SECTION : Users *)
+    (* User accounts on the core (old format) *)
     (************************************)
 
 
@@ -13,20 +52,3 @@
 	(* Depreciated option, kept for compatibility reasons - used by MLDonkey < 2.7.5 *)
  users = [
   (admin, "31D6CFE0D16AE931B73C59D7E0C089C0");]
-
-
-    (************************************)
-    (* SECTION : Users *)
-    (* User accounts on the core (new format) *)
-    (************************************)
-
-
-
-	(* The users that are defined on this core. The default user is
-	called 'admin', and uses an empty password. To create new users,
-	login as admin in mldonkey, and use the 'useradd' command. *)
- users2 = [
-  {     user_name = admin
-     user_pass = "31D6CFE0D16AE931B73C59D7E0C089C0"
-     user_mail = ""
-};]
diff --git a/src/initscripts/init.d/mldonkey b/src/initscripts/init.d/mldonkey
new file mode 100644
index 000000000..ef0918ac4
--- /dev/null
+++ b/src/initscripts/init.d/mldonkey
@@ -0,0 +1,46 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/mldonkey
+#
+# Description : Mldonkey Init Script
+#
+# Authors     : Michael Tremer (ms@ipfire.org)
+#
+# Version     : 01.00
+#
+# Notes       :
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+	start)
+		boot_mesg "Starting mldonkey..."
+		HOME=/opt/mldonkey /opt/mldonkey/mlnet >/dev/null 2>&1 &
+		evaluate_retval
+		;;
+
+	stop)
+		boot_mesg "Stopping mldonkey..."
+		killproc /opt/mldonkey/mlnet
+		;;
+
+	restart)
+		${0} stop
+		sleep 1
+		${0} start
+		;;
+
+	status)
+		statusproc /opt/mldonkey/mlnet
+		;;
+
+	*)
+		echo "Usage: ${0} {start|stop|restart|status}"
+		exit 1
+		;;
+esac
+
+# End $rc_base/init.d/mldonkey
diff --git a/src/paks/mldonkey/install.sh b/src/paks/mldonkey/install.sh
new file mode 100644
index 000000000..bbbacb071
--- /dev/null
+++ b/src/paks/mldonkey/install.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+. /opt/pakfire/lib/functions.sh
+
+extract_files
+
+/etc/init.d/mldonkey start
+
+ln -svf ../init.d/mldonkey /etc/rc.d/rc0.d/K05mldonkey
+ln -svf ../init.d/mldonkey /etc/rc.d/rc3.d/S98mldonkey
+ln -svf ../init.d/mldonkey /etc/rc.d/rc6.d/K05mldonkey
diff --git a/src/paks/mldonkey/uninstall.sh b/src/paks/mldonkey/uninstall.sh
new file mode 100644
index 000000000..3b92dc53a
--- /dev/null
+++ b/src/paks/mldonkey/uninstall.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+/etc/init.d/mldonkey stop
+
+rm -rf /etc/rc.d/rc*.d/*mldonkey
diff --git a/src/paks/mldonkey/update.sh b/src/paks/mldonkey/update.sh
new file mode 100644
index 000000000..a47a7831d
--- /dev/null
+++ b/src/paks/mldonkey/update.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+. /opt/pakfire/lib/functions.sh
+
+extract_files