mldonkey-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Mldonkey-commits] mldonkey distrib/ChangeLog distrib/Developers.t...

From: mldonkey-commits
Subject: [Mldonkey-commits] mldonkey distrib/ChangeLog distrib/Developers.t...
Date: Sat, 07 Aug 2010 14:51:16 +0000 
CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/08/07 14:51:16

Modified files:
        distrib        : ChangeLog Developers.txt Todo.txt 
        distrib/i18n   : mlnet_strings.de_DE.utf8 
                         mlnet_strings.it_IT.UTF-8 
                         mlnet_strings.ru_RU.UTF-8 
        docs           : ChangeLog.old dc1.txt 
        docs/developers: Developers.txt 
        src/daemon/common: commonInteractive.ml commonOptions.ml 
        src/daemon/driver: driverCommands.ml driverInteractive.ml 
        src/gtk2/gui   : guiMessages.ml guiTemplates.ml 
        src/networks/bittorrent: bTInteractive.ml 
        src/networks/donkey: donkeyOptions.ml 
        src/utils/cdk  : filename2.ml 
        src/utils/lib  : CryptoPP.cc CryptoPP.h 
        src/utils/xml-light: xml.mli 

Log message:
        patch #7269

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1453&r2=1.1454
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/Developers.txt?cvsroot=mldonkey&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/Todo.txt?cvsroot=mldonkey&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/i18n/mlnet_strings.de_DE.utf8?cvsroot=mldonkey&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/i18n/mlnet_strings.it_IT.UTF-8?cvsroot=mldonkey&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/i18n/mlnet_strings.ru_RU.UTF-8?cvsroot=mldonkey&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/mldonkey/docs/ChangeLog.old?cvsroot=mldonkey&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/mldonkey/docs/dc1.txt?cvsroot=mldonkey&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/mldonkey/docs/developers/Developers.txt?cvsroot=mldonkey&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonInteractive.ml?cvsroot=mldonkey&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.232&r2=1.233
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.255&r2=1.256
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.140&r2=1.141
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiMessages.ml?cvsroot=mldonkey&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk2/gui/guiTemplates.ml?cvsroot=mldonkey&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.159&r2=1.160
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOptions.ml?cvsroot=mldonkey&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/cdk/filename2.ml?cvsroot=mldonkey&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/CryptoPP.cc?cvsroot=mldonkey&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/CryptoPP.h?cvsroot=mldonkey&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/xml-light/xml.mli?cvsroot=mldonkey&r1=1.3&r2=1.4

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1453
retrieving revision 1.1454
diff -u -b -r1.1453 -r1.1454
--- distrib/ChangeLog   1 Aug 2010 12:15:24 -0000       1.1453
+++ distrib/ChangeLog   7 Aug 2010 14:51:14 -0000       1.1454
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2010/08/07:
+7269: Fix typos (glondu)
+-------------------------------------------------------------------------------
 2010/08/01: version 3.0.3 = tag release-3-0-3
 
 2010/07/28

Index: distrib/Developers.txt
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/Developers.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- distrib/Developers.txt      23 Oct 2006 12:58:35 -0000      1.8
+++ distrib/Developers.txt      7 Aug 2010 14:51:15 -0000       1.9
@@ -7,7 +7,7 @@
 You can also provide mldonkey with support for another p2p network.
 
 If you don't want how to start, you must first understand the code (see the
-informations below), and then, you can call "mldonkey -check_impl" to
+information below), and then, you can call "mldonkey -check_impl" to
 see which methods have not been implemented yet. You can also test different
 operations and see what is not working good. Another option is to test
 other p2p applications and try to import some interesting features in

Index: distrib/Todo.txt
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/Todo.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- distrib/Todo.txt    23 Oct 2006 12:58:35 -0000      1.11
+++ distrib/Todo.txt    7 Aug 2010 14:51:15 -0000       1.12
@@ -21,7 +21,7 @@
   * When a connection succeeds and downloads, we should retry the connection
      ASAP.
   * How to remove servers from disabled networks ?
-  * When a file is commited, we should add a flag to say if it has been
+  * When a file is committed, we should add a flag to say if it has been
       verified or not.
 
 GNUTELLA:
@@ -78,7 +78,7 @@
     * Pause/resume file
     * Reserve upload slots
     * Share downloaded files
-    * Commited or not
+    * Committed or not
 
 FastTrack:
  * Fifo to reconnect to clients PER FILE, limited by the number of currently

Index: distrib/i18n/mlnet_strings.de_DE.utf8
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/i18n/mlnet_strings.de_DE.utf8,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- distrib/i18n/mlnet_strings.de_DE.utf8       28 Apr 2007 10:26:50 -0000      
1.2
+++ distrib/i18n/mlnet_strings.de_DE.utf8       7 Aug 2010 14:51:15 -0000       
1.3
@@ -656,7 +656,7 @@
 
 "The command which is called when a download is started. Arguments\n  are 
'-file <num>'" = "Befehl, der aufgerufen wird, nachdem ein Download gestartet 
wurde. Argumente\n  sind '-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  "
+"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 (preferred 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 (preferred 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" = "Die Maximale Länge 
von Null Bytes zwischen Nicht-Null Bytes in einer Datei die\n während einer 
Wiederaufnahme als runtergeladen interpretiert werden."
 

Index: distrib/i18n/mlnet_strings.it_IT.UTF-8
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/i18n/mlnet_strings.it_IT.UTF-8,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- distrib/i18n/mlnet_strings.it_IT.UTF-8      28 Apr 2007 18:58:29 -0000      
1.5
+++ distrib/i18n/mlnet_strings.it_IT.UTF-8      7 Aug 2010 14:51:15 -0000       
1.6
@@ -494,7 +494,7 @@
 
 "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"
+"Allow mldonkey to propagate your sources to other mldonkey clients.\n   This 
function is superseded by eMule-style source exchange,\n   this option is 
outdated" = "Allow mldonkey to propagate your sources to other mldonkey 
clients.\n   This function is superseded 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"
 
@@ -720,7 +720,7 @@
 
 "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  "
+"A command that is called when a file is committed, does not work on MinGW.\n  
Arguments are (kept for compatibility):\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 (preferred 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 compatibility):\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 (preferred 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"
 

Index: distrib/i18n/mlnet_strings.ru_RU.UTF-8
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/i18n/mlnet_strings.ru_RU.UTF-8,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- distrib/i18n/mlnet_strings.ru_RU.UTF-8      24 Jul 2010 16:45:07 -0000      
1.1
+++ distrib/i18n/mlnet_strings.ru_RU.UTF-8      7 Aug 2010 14:51:15 -0000       
1.2
@@ -512,7 +512,7 @@
 
 "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" = "Разрешить mldonkey пропагандировать 
ваши источники другим клиентам mldonkey.\n   Эта 
функция is superseeded by eMule-style source exchange,\n   эта 
опция устарела"
+"Allow mldonkey to propagate your sources to other mldonkey clients.\n   This 
function is superseded by eMule-style source exchange,\n   this option is 
outdated" = "Разрешить mldonkey пропагандировать 
ваши источники другим клиентам mldonkey.\n   Эта 
функция is superseded by eMule-style source exchange,\n   эта 
опция устарела"
 
 "The maximal delay a connection with a server should last when walking through 
the list" = "Максимальная длительность задержки 
соединения с сервером, при прохождении 
списка серверов"
 
@@ -734,9 +734,9 @@
 
 "The login of the user you want mldonkey to run as, after the ports\n  have 
been bound (can be used not to run with root privileges 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 used not to run with root privileges when\n  a 
port < 1024 is needed)"
 
-"The command which is called when a download is started. Arguments\n  are 
'-file <num>'\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    $NETWORK   - network used for downloading\n    $ED2K_HASH - 
ed2k hash if MD4 is known\n    $FILE_OWNER - user who started the download\n    
$FILE_GROUP - group the file belongs to\n    $USER_MAIL - mail address of 
file_owner\n  " = "Комманда которая будет 
запускаться когда начинается закачка. 
Аргументы:\n  '-file <num>'\n  Также возможно 
использование переменных окружения 
(предпочитаемый путь):\n    $TEMPNAME  - имя 
временного файла, включая путь к файлу\n    
$FILEID    - тоже что и $1\n    $FILESIZE  -  тоже что и $2\n   
 $FILENAME  - тоже что и $3\n    $FILEHASH  - внутренний х
еш\n    $NETWORK   - сеть которая использовалась 
для закачки\n    $ED2K_HASH - ed2k хеш если MD4 
известен\n    $FILE_OWNER - пользователь который 
инициировал закачку\n    $FILE_GROUP - группа 
которой принадлежит файл\n    $USER_MAIL - 
почтовый адресс file_owner\n  "
+"The command which is called when a download is started. Arguments\n  are 
'-file <num>'\n  Also these environment variables can be used (preferred 
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    $NETWORK   - network used for downloading\n    $ED2K_HASH 
- ed2k hash if MD4 is known\n    $FILE_OWNER - user who started the download\n  
  $FILE_GROUP - group the file belongs to\n    $USER_MAIL - mail address of 
file_owner\n  " = "Комманда которая будет 
запускаться когда начинается закачка. 
Аргументы:\n  '-file <num>'\n  Также возможно 
использование переменных окружения 
(предпочитаемый путь):\n    $TEMPNAME  - имя 
временного файла, включая путь к файлу\n    
$FILEID    - тоже что и $1\n    $FILESIZE  -  тоже что и $2\n   
 $FILENAME  - тоже что и $3\n    $FILEHASH  - внутренний х
еш\n    $NETWORK   - сеть которая использовалась 
для закачки\n    $ED2K_HASH - ed2k хеш если MD4 
известен\n    $FILE_OWNER - пользователь который 
инициировал закачку\n    $FILE_GROUP - группа 
которой принадлежит файл\n    $USER_MAIL - 
почтовый адресс file_owner\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    
$FILE_OWNER - user who started the download\n    $FILE_GROUP - group the file 
belongs to\n    $USER_MAIL - mail address of file_owner\n  " = 
"Комманда которая выполняется после того 
как файл был перемещен в папку 
пользователя, не работает на MinGW.\n  
Аргументы: (сохранены для совместимости):\n   
 $1 - имя временного файла, без пути\n    $2 - 
размер файла\n    $3 - имя файла\n  Также 
возможно использование переменных 
окружения (предпочитаемый путь):\n    $TEMPNAME  - 
имя временного файла, включая путь\n    $FILEID    
- то же что и $1\n    $FILESIZE  - то же что и $2\n    
$FILENAME  - то же что и $3\n    $FILEHASH  - внутренний х
ещ\n    $DURATION  - длительность загрузки\n    $INCOMING 
 - директория в которую перемещался файл\n    
$NETWORK   - сеть которая использовалась для 
закачки\n    $ED2K_HASH - ed2k хеш если MD4 известен\n    
$FILE_OWNER - пользователь который инициировал 
закачку\n    $FILE_GROUP - группа которой 
принадлежит файл\n    $USER_MAIL - почтовый адресс 
file_owner\n  "
+"A command that is called when a file is committed, does not work on MinGW.\n  
Arguments are (kept for compatibility):\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 (preferred 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    
$FILE_OWNER - user who started the download\n    $FILE_GROUP - group the file 
belongs to\n    $USER_MAIL - mail address of file_owner\n  " = 
"Комманда которая выполняется после того 
как файл был перемещен в папку 
пользователя, не работает на MinGW.\n  
Аргументы: (сохранены для совместимости):\n   
 $1 - имя временного файла, без пути\n    $2 - 
размер файла\n    $3 - имя файла\n  Также 
возможно использование переменных 
окружения (предпочитаемый путь):\n    $TEMPNAME  - 
имя временного файла, включая путь\n    $FILEID    
- то же что и $1\n    $FILESIZE  - то же что и $2\n    
$FILENAME  - то же что и $3\n    $FILEHASH  - внутренний х
ещ\n    $DURATION  - длительность загрузки\n    $INCOMING 
 - директория в которую перемещался файл\n    
$NETWORK   - сеть которая использовалась для 
закачки\n    $ED2K_HASH - ed2k хеш если MD4 известен\n    
$FILE_OWNER - пользователь который инициировал 
закачку\n    $FILE_GROUP - группа которой 
принадлежит файл\n    $USER_MAIL - почтовый адресс 
file_owner\n  "
 
 "The maximal length of zero bytes between non-zero bytes in a file that\n  
should be interpreted as downloaded during a recovery" = 
"Максимальная длина цепочки нулевых байтов 
между не нулевыми байтами в файле который\n  
должен интерпретироваться как скачанный 
во время восстановления"
 

Index: docs/ChangeLog.old
===================================================================
RCS file: /sources/mldonkey/mldonkey/docs/ChangeLog.old,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- docs/ChangeLog.old  23 Oct 2009 05:52:56 -0000      1.4
+++ docs/ChangeLog.old  7 Aug 2010 14:51:15 -0000       1.5
@@ -56,7 +56,7 @@
 5897: FileTP: Support HTTP downloads of files > 1GB
 5815: Unix32: Override system umask to force correct function
       of option create_file_mode (pango)
-5912: Extend patch 5817: "Code updates for Ocaml 3.10.0beta compatability"
+5912: Extend patch 5817: "Code updates for Ocaml 3.10.0beta compatibility"
       to Ocaml 3.11
 5910: EDK: Revoke upload slot when client asks for blocks positioned after EOF
 5908: Fix commit when incoming filesystem allows more than 16M chars
@@ -149,7 +149,7 @@
 5819: MinGW: Fix charsetstubs.c compile with latest MinGW
 
 2007/03/25
-5817: Code updates for Ocaml 3.10.0beta compatability
+5817: Code updates for Ocaml 3.10.0beta compatibility
 - to use Ocaml 3.10 add ./configure option --enable-ocamlver=3.10
 - MLDonkey will accept the new Ocaml version without this option when
   the final version of Ocaml 3.10 is released and proven to be working
@@ -908,7 +908,7 @@
 * Blocksize is computed like this: file_size / 200, rounded up to full
   megabytes, if bigger than 10MB: 10 MB are used as maximum blocksize.
   Preallocated blocks are marked file_disk_allocation_bitmap option.
-* Blocks already fully preallocated on disk are prefered for downloading.
+* Blocks already fully preallocated on disk are preferred for downloading.
   That way one can get antifragmentation benefits without preallocating
   too much space, specially for downloads with small chunks.
 * If the block about to be filled with data for the first time its read/written
@@ -1586,7 +1586,7 @@
   - 5 upload slots
   - 20 fd as reserve for ini files
 4704: Fix some C compile warnings (schlumpf)
-4739: Fix some cross-compiling obstacles, remove Ocaml 3.08.2 compatability
+4739: Fix some cross-compiling obstacles, remove Ocaml 3.08.2 compatibility
 * Cross-compiling is only possible with a correct Ocaml toolchain
 * MLDonkey can not build this Ocaml toolchain
 * This patch only fixes some autoconf checks
@@ -1695,11 +1695,11 @@
 * added environment variables for file_completed_cmd, see description:
 
     A command that is called when a file is committed, does not work on MinGW.
-    Arguments are (kept for compatability):
+    Arguments are (kept for compatibility):
     $1 - temp file name, without path
     $2 - file size
     $3 - filename of the committed file
-    Also these environment variables can be used (prefered way):
+    Also these environment variables can be used (preferred way):
     $TEMPNAME - temp file name, including path
     $FILEID - same as $1
     $FILESIZE - same as $2
@@ -2345,7 +2345,7 @@
 
 2005/06/23
 4122: EDK: "server <met>" command now responds with a clearer answer (Knocker)
-4121: EDK: Dont remove prefered server if server_users < min_users_on_server
+4121: EDK: Dont remove preferred server if server_users < min_users_on_server
       (Knocker)
 4120: EDK: send emule_version to servers (Knocker)
 4083: new build target: release.mlnet.distri
@@ -3296,7 +3296,7 @@
         be used afterwards (but it does not remove the file). Used
         in CommonInteractive.file_commit and CommonInteractive.file_cancel.
   * DonkeyInteractive: clients might get stucked if they tried to
-      upload a file that has just been commited, since the name is not
+      upload a file that has just been committed, since the name is not
       updated anymore in Unix32.rename. We need to remove the former 'file' 
       structure and then add a new one for the shared file, thus disconnecting
       all the former uploaders (knowing them, they will reconnect asap :)).
@@ -3393,7 +3393,7 @@
         case of error. 
      * New format SparseFile completely implemented. 
      * Unix32.rename makes the Unix32.t invalid. Might cause some bugs
-        when sharing just commited files (TO CHECK).
+        when sharing just committed files (TO CHECK).
   * Options:
      * New EXPERIMENTAL option 'emulate_sparsefiles' in downloads.ini,
         to emulate sparse files on non-sparse filesystems (e.g. FAT).
@@ -4245,8 +4245,8 @@
 
 2003/02/26: Simon (v 2.02-21)
   - eDonkey: 
-      * Save hashes of commited files in shared_files.ini to remove
-        rehashing commited files on startup
+      * Save hashes of committed files in shared_files.ini to remove
+        rehashing committed files on startup
       * Remove / after the md4 in ed2k links      
       * Full-Chunks SUPPORTED
   - Applied patch #1185
@@ -5043,7 +5043,7 @@
       improve that ? Must check that this timeout is changed when the client
       becomes interesting (queued for upload or download). Also set
       max_clients_per_second to more than 5...
-  - fix: prefered files are not queried twice anymore, nor client repeatedly 
+  - fix: preferred files are not queried twice anymore, nor client repeatedly
      queried after connection, to avoid Emule Black-list stupid mechanism.
   - fix: unknown commands should print an error now
   - add: new command "priority" that can be used to change the priority of
@@ -5109,7 +5109,7 @@
   - fix: upload improvements
      * names are correctly chosen, and sent to the server
      * all BUFFER_OVERFLOW due to long file lists have been removed
-     * after restart, non commited files are still shared.
+     * after restart, non committed files are still shared.
      * bug fixed when shared file list is too long (shortened message)
      * the size of the ShareReq message directly depends on the space
         available in the server buffer.

Index: docs/dc1.txt
===================================================================
RCS file: /sources/mldonkey/mldonkey/docs/dc1.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- docs/dc1.txt        26 Jun 2002 11:49:45 -0000      1.1
+++ docs/dc1.txt        7 Aug 2010 14:51:15 -0000       1.2
@@ -395,8 +395,8 @@
 
    this protocol specs writen and analyst by suxxx
    without any help from neo-modus.com if you want
-   informations about the protocol or if you have
-   informations about some messages eg.write me a mail.
+   information about the protocol or if you have
+   information about some messages eg.write me a mail.
 
 Telechargement dans DC:
 

Index: docs/developers/Developers.txt
===================================================================
RCS file: /sources/mldonkey/mldonkey/docs/developers/Developers.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- docs/developers/Developers.txt      22 Apr 2003 22:33:39 -0000      1.1
+++ docs/developers/Developers.txt      7 Aug 2010 14:51:15 -0000       1.2
@@ -7,7 +7,7 @@
 You can also provide mldonkey with support for another p2p network.
 
 If you don't want how to start, you must first understand the code (see the
-informations below), and then, you can call "mldonkey -check_impl" to
+information below), and then, you can call "mldonkey -check_impl" to
 see which methods have not been implemented yet. You can also test different
 operations and see what is not working good. Another option is to test
 other p2p applications and try to import some interesting features in

Index: src/daemon/common/commonInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonInteractive.ml,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- src/daemon/common/commonInteractive.ml      23 May 2010 09:12:14 -0000      
1.107
+++ src/daemon/common/commonInteractive.ml      7 Aug 2010 14:51:15 -0000       
1.108
@@ -127,7 +127,7 @@
     end
   end
 
-let file_commited_name incoming_dir file =
+let file_committed_name incoming_dir file =
   (try Unix2.safe_mkdir incoming_dir with _ -> ());
   let fs = Unix32.filesystem incoming_dir in
   let namemax =
@@ -240,7 +240,7 @@
             ()
           in
 
-         let new_name = file_commited_name incoming.shdir_dirname file in
+         let new_name = file_committed_name incoming.shdir_dirname file in
            if Unix2.is_directory file_name then begin
              Unix2.safe_mkdir new_name;
              Unix2.chmod new_name !Unix32.create_dir_mode;
@@ -268,7 +268,7 @@
                       incoming.shdir_dirname incoming.shdir_priority
                       best_name new_name);
               with e ->
-                  lprintf_nl "Exception %s while trying to share commited file"
+                  lprintf_nl "Exception %s while trying to share committed 
file"
                     (Printexc2.to_string e);
             end;
 

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -b -r1.232 -r1.233
--- src/daemon/common/commonOptions.ml  23 May 2010 09:12:14 -0000      1.232
+++ src/daemon/common/commonOptions.ml  7 Aug 2010 14:51:15 -0000       1.233
@@ -1217,11 +1217,11 @@
 
 let file_completed_cmd = define_option current_section ["file_completed_cmd"]
   "A command that is called when a file is committed, does not work on MinGW.
-  Arguments are (kept for compatability):
+  Arguments are (kept for compatibility):
     $1 - temp file name, without path
     $2 - file size
     $3 - filename of the committed file
-  Also these environment variables can be used (prefered way):
+  Also these environment variables can be used (preferred way):
     $TEMPNAME  - temp file name, including path
     $FILEID    - same as $1
     $FILESIZE  - same as $2
@@ -1240,7 +1240,7 @@
 let file_started_cmd = define_option current_section ["file_started_cmd"]
   "The command which is called when a download is started. Arguments
   are '-file <num>'
-  Also these environment variables can be used (prefered way):
+  Also these environment variables can be used (preferred way):
     $TEMPNAME  - temp file name, including path
     $FILEID    - same as $1
     $FILESIZE  - same as $2

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -b -r1.255 -r1.256
--- src/daemon/driver/driverCommands.ml 16 Jul 2010 13:58:39 -0000      1.255
+++ src/daemon/driver/driverCommands.ml 7 Aug 2010 14:51:15 -0000       1.256
@@ -1804,7 +1804,7 @@
 \\<td nowrap title=\\\"Show shares Tab (also related for incoming 
directory)\\\" class=\\\"fbig fbigpad\\\"\\>\\<a 
onclick=\\\"javascript:window.location.href='submit?q=shares'\\\"\\>Shares\\</a\\>\\</td\\>
 %s
 \\<td nowrap title=\\\"Show Web_infos Tab where you can add/remove automatic 
downloads like serverlists\\\" class=\\\"fbig fbigpad\\\"\\>\\<a 
onclick=\\\"javascript:window.location.href='submit?q=vwi'\\\"\\>Web 
infos\\</a\\>\\</td\\>
-\\<td nowrap title=\\\"Show Calendar Tab, there are informations about 
automatically jobs\\\" class=\\\"fbig fbigpad\\\"\\>\\<a 
onclick=\\\"javascript:window.location.href='submit?q=vcal'\\\"\\>Calendar\\</a\\>\\</td\\>
+\\<td nowrap title=\\\"Show Calendar Tab, there are information about 
automatically jobs\\\" class=\\\"fbig fbigpad\\\"\\>\\<a 
onclick=\\\"javascript:window.location.href='submit?q=vcal'\\\"\\>Calendar\\</a\\>\\</td\\>
 \\<td nowrap title=\\\"Change to simple Webinterface without html_mods\\\" 
class=\\\"fbig fbigpad\\\"\\>\\<a 
onclick=\\\"javascript:window.location.href='submit?q=html_mods'\\\"\\>Toggle 
html_mods\\</a\\>\\</td\\>
 \\<td nowrap title=\\\"voo\\\" class=\\\"fbig pr fbigpad\\\"\\>\\<a 
onclick=\\\"javascript:window.location.href='submit?q=voo+1'\\\"\\>Full 
Options\\</a\\>\\</td\\>
 \\</tr\\>\\</table\\>
@@ -2183,7 +2183,7 @@
               button ~title:"Show users Tab where you can add/remove Users" 
~cls:"fbig fbigb" ~cmd:"users" "Users";
 
             button ~title:"Show Web_infos Tab where you can add/remove 
automatic downloads like serverlists" ~cls:"fbig fbigb" ~cmd:"vwi" "Web infos";
-            button ~title:"Show Calendar Tab, there are informations about 
automatically jobs" ~cls:"fbig fbigb" ~cmd:"vcal" "Calendar";
+            button ~title:"Show Calendar Tab, there are information about 
automatically jobs" ~cls:"fbig fbigb" ~cmd:"vcal" "Calendar";
             put "\\<td nowrap class=\\\"fbig fbigb pr\\\"\\>
 \\<form style=\\\"margin: 0px;\\\" name=\\\"htmlModsStyleForm\\\" 
id=\\\"htmlModsStyleForm\\\"
 action=\\\"javascript:submitHtmlModsStyle();\\\"\\>";
@@ -3147,9 +3147,9 @@
         let buf = o.conn_buf in
         if o.conn_output = HTML then
           html_mods_table_one_row buf "serversTable" "servers" [
-            ("", "srh", "Commited"); ]
+            ("", "srh", "Committed"); ]
         else
-          Printf.bprintf buf "Commited";
+          Printf.bprintf buf "Committed";
         ""
     ) , ":\t\t\t\t$bmove downloaded files to incoming directory$n";
 

Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- src/daemon/driver/driverInteractive.ml      23 May 2010 09:12:14 -0000      
1.140
+++ src/daemon/driver/driverInteractive.ml      7 Aug 2010 14:51:15 -0000       
1.141
@@ -1170,10 +1170,10 @@
         if !!auto_commit then
           if o.conn_output = HTML then
             html_mods_table_one_row buf "searchTable" "search" [
-              ("", "srh", "Files will be automatically commited in the 
incoming directory"); ]
+              ("", "srh", "Files will be automatically committed in the 
incoming directory"); ]
           else
             Printf.bprintf buf
-              "Files will be automatically commited in the incoming directory"
+              "Files will be automatically committed in the incoming directory"
         else
           if o.conn_output = HTML then
             html_mods_table_one_row buf "searchTable" "search" [
@@ -1946,7 +1946,7 @@
      
     if html then
       html_mods_table_header buf "sharesTable" "shares" [
-       ( "0", "srh", "core Build informations", "Buildinfo" ) ;
+       ( "0", "srh", "core Build information", "Buildinfo" ) ;
        ( "0", "srh", "", "" ) ]
     else
       Printf.bprintf buf "\n\t--Buildinfo--\n";
@@ -2075,7 +2075,7 @@
 
     if html then
       html_mods_table_header buf "sharesTable" "shares" [
-       ( "0", "srh", "core runtime informations", "Runinfo" ) ;
+       ( "0", "srh", "core runtime information", "Runinfo" ) ;
        ( "0", "srh", "", "" ) ]
     else
       Printf.bprintf buf "\n\t--Runinfo--\n";

Index: src/gtk2/gui/guiMessages.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiMessages.ml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- src/gtk2/gui/guiMessages.ml 25 Oct 2006 11:34:46 -0000      1.13
+++ src/gtk2/gui/guiMessages.ml 7 Aug 2010 14:51:16 -0000       1.14
@@ -548,7 +548,7 @@
 let iM_me_quit = ref ""
 let iM_me_remove = ref ""
 let iM_me_join_room = ref ""
-let iM_me_prefered_rooms = ref ""
+let iM_me_preferred_rooms = ref ""
 let iM_lb_new_account = ref ""
 let im_lb_room_name = ref ""
 let iM_lb_join_room = ref ""
@@ -1014,7 +1014,7 @@
   iM_me_quit := _s "Quit";
   iM_me_remove := _s "Remove";
   iM_me_join_room := _s "Join Room";
-  iM_me_prefered_rooms := _s "Prefered Rooms";
+  iM_me_preferred_rooms := _s "Preferred Rooms";
   iM_lb_new_account := _s "New Account";
   im_lb_room_name := _s "Room Name";
   iM_lb_join_room := _s "Join Room";

Index: src/gtk2/gui/guiTemplates.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk2/gui/guiTemplates.ml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/gtk2/gui/guiTemplates.ml        3 Nov 2007 22:04:52 -0000       1.8
+++ src/gtk2/gui/guiTemplates.ml        7 Aug 2010 14:51:16 -0000       1.9
@@ -68,7 +68,7 @@
      |                           on a "store" may take tremendeous time when a 
GTree.view
      |                           is connected to it. When we add, remove, 
store, ... the 
      |                           GTree.model interface of the "store" 
communicate those
-     |                           informations to the GTree.view to 
display/render the changes.
+     |                           information to the GTree.view to 
display/render the changes.
      |                           To improve the speed, we disconnect the 
g_list / g_tree
      |                           from the #g_view (a treeview for instance). 
Once these
      |                           operations are over, the g_list / g_tree is 
reconnected to the GTree.view.

Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -b -r1.159 -r1.160
--- src/networks/bittorrent/bTInteractive.ml    28 Jul 2010 16:25:44 -0000      
1.159
+++ src/networks/bittorrent/bTInteractive.ml    7 Aug 2010 14:51:16 -0000       
1.160
@@ -181,7 +181,7 @@
               file.file_torrent_diskname new_torrent_diskname));
       file.file_torrent_diskname <- new_torrent_diskname;
 
-      (* update file_shared with new path to commited file *)
+      (* update file_shared with new path to committed file *)
       match file.file_shared with
       | None -> ()
       | Some old_impl ->

Index: src/networks/donkey/donkeyOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOptions.ml,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- src/networks/donkey/donkeyOptions.ml        24 Feb 2009 18:35:46 -0000      
1.68
+++ src/networks/donkey/donkeyOptions.ml        7 Aug 2010 14:51:16 -0000       
1.69
@@ -117,7 +117,7 @@
 
 let propagate_sources = define_expert_option donkey_section 
["propagate_sources"]
   "Allow mldonkey to propagate your sources to other mldonkey clients.
-   This function is superseeded by eMule-style source exchange,
+   This function is superseded by eMule-style source exchange,
    this option is outdated"
     bool_option false
 

Index: src/utils/cdk/filename2.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/cdk/filename2.ml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/utils/cdk/filename2.ml  31 Mar 2008 07:58:16 -0000      1.9
+++ src/utils/cdk/filename2.ml  7 Aug 2010 14:51:16 -0000       1.10
@@ -241,7 +241,7 @@
   try
     Sys.getenv "MLDONKEY_TEMP"
   with Not_found ->
-(* kept for compatability with Filename.temp_dir_name, this code
+(* kept for compatibility with Filename.temp_dir_name, this code
    is never reached because $MLDONKEY_TEMP is filled in commonOptions.ml *)
   match Sys.os_type with
     | "Unix" | "Cygwin" ->

Index: src/utils/lib/CryptoPP.cc
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/CryptoPP.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/utils/lib/CryptoPP.cc   29 Jul 2008 17:26:38 -0000      1.9
+++ src/utils/lib/CryptoPP.cc   7 Aug 2010 14:51:16 -0000       1.10
@@ -7000,7 +7000,7 @@
        unsigned int maxRecoverableLength = 
mei.MaxRecoverableLength(MessageRepresentativeBitLength(), 
GetHashIdentifier().second, ma.AccessHash().DigestSize());
 
        if (maxRecoverableLength == 0)
-               {throw NotImplemented("TF_SignerBase: this algorithm does not 
support messsage recovery or the key is too short");}
+               {throw NotImplemented("TF_SignerBase: this algorithm does not 
support message recovery or the key is too short");}
        if (recoverableMessageLength > maxRecoverableLength)
                throw InvalidArgument("TF_SignerBase: the recoverable message 
part is too long for the given key and algorithm");
 

Index: src/utils/lib/CryptoPP.h
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/CryptoPP.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/utils/lib/CryptoPP.h    13 Dec 2007 18:06:56 -0000      1.7
+++ src/utils/lib/CryptoPP.h    7 Aug 2010 14:51:16 -0000       1.8
@@ -101,7 +101,7 @@
 #      define IS_LITTLE_ENDIAN
 #endif
 
-// override #define in caml/compatability.h
+// override #define in caml/compatibility.h
 #undef flush 
 
 // define this if you want to disable all OS-dependent features,
@@ -6614,7 +6614,7 @@
 class CRYPTOPP_DLL AutoSeededRandomPool : public RandomPool
 {
 public:
-       //! blocking will be ignored if the prefered RNG isn't available
+       //! blocking will be ignored if the preferred RNG isn't available
        explicit AutoSeededRandomPool(bool blocking = false, unsigned int 
seedSize = 32)
                {Reseed(blocking, seedSize);}
        void Reseed(bool blocking = false, unsigned int seedSize = 32);

Index: src/utils/xml-light/xml.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/xml-light/xml.mli,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/utils/xml-light/xml.mli 11 Apr 2010 10:45:25 -0000      1.3
+++ src/utils/xml-light/xml.mli 7 Aug 2010 14:51:16 -0000       1.4
@@ -42,7 +42,7 @@
        you can use theses functions. But if you want advanced parsing usage,
        please look at the {!XmlParser} module.
        All the parsing functions can raise some exceptions, see the
-       {{:#exc}Exceptions} section for more informations. *)
+       {{:#exc}Exceptions} section for more information. *)
 
 (** Parse the named file into an Xml data structure. *)
 val parse_file : string -> xml
@@ -65,11 +65,11 @@
        {li {!Xml.File_not_found} is raised when and error occured while
                opening a file with the {!Xml.parse_file} function or when a
                DTD file declared by the Xml document is not found {i (see the
-               {!XmlParser} module for more informations on how to handle the
+               {!XmlParser} module for more information on how to handle the
                DTD file loading)}.}
        }
        If the Xml document is containing a DTD, then some other exceptions
-       can be raised, see the module {!Dtd} for more informations.
+       can be raised, see the module {!Dtd} for more information.
  *)
 
 exception Error of error
reply via email to
[Prev in Thread] Current Thread [Next in Thread]