From: Stephane Glondu <steph@glondu.net>
Date: Thu, 5 Aug 2010 22:08:45 -0400
Subject: [PATCH] Fix typos

Signed-off-by: Stephane Glondu <steph@glondu.net>
---
 distrib/Developers.txt                   |    2 +-
 distrib/Todo.txt                         |    4 ++--
 distrib/i18n/mlnet_strings.de_DE.utf8    |    2 +-
 distrib/i18n/mlnet_strings.it_IT.UTF-8   |    4 ++--
 distrib/i18n/mlnet_strings.ru_RU.UTF-8   |    6 +++---
 docs/ChangeLog.old                       |   26 +++++++++++++-------------
 docs/dc1.txt                             |    4 ++--
 docs/developers/Developers.txt           |    2 +-
 src/daemon/common/commonInteractive.ml   |    6 +++---
 src/daemon/common/commonOptions.ml       |    6 +++---
 src/daemon/driver/driverCommands.ml      |    8 ++++----
 src/daemon/driver/driverInteractive.ml   |    8 ++++----
 src/gtk2/gui/guiMessages.ml              |    4 ++--
 src/gtk2/gui/guiTemplates.ml             |    2 +-
 src/networks/bittorrent/bTInteractive.ml |    2 +-
 src/networks/donkey/donkeyOptions.ml     |    2 +-
 src/utils/cdk/filename2.ml               |    2 +-
 src/utils/lib/CryptoPP.cc                |    2 +-
 src/utils/lib/CryptoPP.h                 |    4 ++--
 src/utils/xml-light/xml.mli              |    6 +++---
 20 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/distrib/Developers.txt b/distrib/Developers.txt
index ac516ac..dd1569e 100644
--- a/distrib/Developers.txt
+++ b/distrib/Developers.txt
@@ -7,7 +7,7 @@ add more features, and we will grant you access to the CVS in the future.
 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
diff --git a/distrib/Todo.txt b/distrib/Todo.txt
index 1eacb43..65d460c 100644
--- a/distrib/Todo.txt
+++ b/distrib/Todo.txt
@@ -21,7 +21,7 @@ URGENT WORK:
   * 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 @@ BitTorrent:
     * 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
diff --git a/distrib/i18n/mlnet_strings.de_DE.utf8 b/distrib/i18n/mlnet_strings.de_DE.utf8
index 139409c..08c1789 100644
--- a/distrib/i18n/mlnet_strings.de_DE.utf8
+++ b/distrib/i18n/mlnet_strings.de_DE.utf8
@@ -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."
 
diff --git a/distrib/i18n/mlnet_strings.it_IT.UTF-8 b/distrib/i18n/mlnet_strings.it_IT.UTF-8
index fae2ba2..f340e0b 100644
--- a/distrib/i18n/mlnet_strings.it_IT.UTF-8
+++ b/distrib/i18n/mlnet_strings.it_IT.UTF-8
@@ -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"
 
diff --git a/distrib/i18n/mlnet_strings.ru_RU.UTF-8 b/distrib/i18n/mlnet_strings.ru_RU.UTF-8
index 2c778df..58a70fd 100644
--- a/distrib/i18n/mlnet_strings.ru_RU.UTF-8
+++ b/distrib/i18n/mlnet_strings.ru_RU.UTF-8
@@ -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  должен интерпретироваться как скачанный во время восстановления"
 
diff --git a/docs/ChangeLog.old b/docs/ChangeLog.old
index f8044f5..a1dba97 100644
--- a/docs/ChangeLog.old
+++ b/docs/ChangeLog.old
@@ -56,7 +56,7 @@ Updated Mozilla protocol handler to version 2.1
 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 @@ Updated Mozilla protocol handler to version 2.1
 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 @@ new options:
 * 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 @@ A patch can be found here: http://caml.inria.fr/mantis/view.php?id=3948
   - 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 @@ A patch can be found here: http://caml.inria.fr/mantis/view.php?id=3948
 * 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 @@ patch posted in bug 13619:
 
 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 @@ A SERIOUS bug is in 2.5.29, don't use it, version 2.5.30 will appear soon !
         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 @@ A SERIOUS bug is in 2.5.29, don't use it, version 2.5.30 will appear soon !
         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 @@ due to problems with old clients accessing savannah at startup.
 
 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 @@ due to problems with old clients accessing savannah at startup.
       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 @@ due to problems with old clients accessing savannah at startup.
   - 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.
diff --git a/docs/dc1.txt b/docs/dc1.txt
index 29ac3fe..afc065f 100644
--- a/docs/dc1.txt
+++ b/docs/dc1.txt
@@ -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:
 
diff --git a/docs/developers/Developers.txt b/docs/developers/Developers.txt
index 991bc22..2537725 100644
--- a/docs/developers/Developers.txt
+++ b/docs/developers/Developers.txt
@@ -7,7 +7,7 @@ add more features, and we will grant you access to the CVS in the future.
 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
diff --git a/src/daemon/common/commonInteractive.ml b/src/daemon/common/commonInteractive.ml
index 324f434..a43cb93 100644
--- a/src/daemon/common/commonInteractive.ml
+++ b/src/daemon/common/commonInteractive.ml
@@ -127,7 +127,7 @@ let send_dirfull_warning dir full line1 =
     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 @@ let file_commit file =
             ()
           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 @@ let file_commit file =
                       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;
 
diff --git a/src/daemon/common/commonOptions.ml b/src/daemon/common/commonOptions.ml
index 31189f5..a0ff028 100644
--- a/src/daemon/common/commonOptions.ml
+++ b/src/daemon/common/commonOptions.ml
@@ -1217,11 +1217,11 @@ let max_recover_gap = define_option current_section ["max_recover_zeroes_gap"]
 
 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_completed_cmd = define_option current_section ["file_completed_cmd"]
 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
diff --git a/src/daemon/driver/driverCommands.ml b/src/daemon/driver/driverCommands.ml
index d03ebf1..fa70f9b 100644
--- a/src/daemon/driver/driverCommands.ml
+++ b/src/daemon/driver/driverCommands.ml
@@ -1804,7 +1804,7 @@ let _ =
 \\<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 @@ action=\\\"javascript:pluginSubmit();\\\"\\>";
               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 _ =
         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";
 
diff --git a/src/daemon/driver/driverInteractive.ml b/src/daemon/driver/driverInteractive.ml
index cf4212a..e9b0bd3 100644
--- a/src/daemon/driver/driverInteractive.ml
+++ b/src/daemon/driver/driverInteractive.ml
@@ -1170,10 +1170,10 @@ let display_file_list buf o l =
         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 @@ let buildinfo html buf =
      
     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 @@ let runinfo html buf o =
 
     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";
diff --git a/src/gtk2/gui/guiMessages.ml b/src/gtk2/gui/guiMessages.ml
index c9490bc..3258be8 100644
--- a/src/gtk2/gui/guiMessages.ml
+++ b/src/gtk2/gui/guiMessages.ml
@@ -548,7 +548,7 @@ let iM_me_settings = ref ""
 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 @@ let load_messages () =
   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";
diff --git a/src/gtk2/gui/guiTemplates.ml b/src/gtk2/gui/guiTemplates.ml
index 5fca976..cc32fb3 100644
--- a/src/gtk2/gui/guiTemplates.ml
+++ b/src/gtk2/gui/guiTemplates.ml
@@ -68,7 +68,7 @@ let verbose_chat = O.gtk_verbose_chat
      |                           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.
diff --git a/src/networks/bittorrent/bTInteractive.ml b/src/networks/bittorrent/bTInteractive.ml
index 3bfb4f0..9ecc8ac 100644
--- a/src/networks/bittorrent/bTInteractive.ml
+++ b/src/networks/bittorrent/bTInteractive.ml
@@ -181,7 +181,7 @@ let op_file_commit file new_name =
               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 ->
diff --git a/src/networks/donkey/donkeyOptions.ml b/src/networks/donkey/donkeyOptions.ml
index 072e13e..9ebc056 100644
--- a/src/networks/donkey/donkeyOptions.ml
+++ b/src/networks/donkey/donkeyOptions.ml
@@ -117,7 +117,7 @@ let log_clients_on_console = define_expert_option donkey_section ["log_clients_o
 
 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
 
diff --git a/src/utils/cdk/filename2.ml b/src/utils/cdk/filename2.ml
index 41202d9..7fde536 100644
--- a/src/utils/cdk/filename2.ml
+++ b/src/utils/cdk/filename2.ml
@@ -241,7 +241,7 @@ let temp_dir_name () =
   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" ->
diff --git a/src/utils/lib/CryptoPP.cc b/src/utils/lib/CryptoPP.cc
index 5264377..9208e1c 100644
--- a/src/utils/lib/CryptoPP.cc
+++ b/src/utils/lib/CryptoPP.cc
@@ -7000,7 +7000,7 @@ void TF_SignerBase::InputRecoverableMessage(PK_MessageAccumulator &messageAccumu
 	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");
 
diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h
index 4e3e64c..d2ec1b2 100644
--- a/src/utils/lib/CryptoPP.h
+++ b/src/utils/lib/CryptoPP.h
@@ -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 @@ CRYPTOPP_DLL void OS_GenerateRandomBlock(bool blocking, byte *output, unsigned i
 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);
diff --git a/src/utils/xml-light/xml.mli b/src/utils/xml-light/xml.mli
index 0d3248f..def863f 100644
--- a/src/utils/xml-light/xml.mli
+++ b/src/utils/xml-light/xml.mli
@@ -42,7 +42,7 @@ open Xml_types
 	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 @@ val parse_string : string -> xml
 	{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
-- 
