From 19d593413c5e2199946ab6a1fcaedca3c59d42df Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Mon, 7 Aug 2006 16:28:41 +0000 Subject: [PATCH] 2006-08-08 Tatsuhiro Tsujikawa * po/ru.po: Azamat sent me Russian translation. * src/FtpNegotiateCommand.cc (recvGreeting): Call disableWriteCheckSocket just after socket->setBlockingMode(). This avoids unnecessary CPU-hog loop. Rename Time.h to TimeA2.h to avoid compilation ploblem on case-insesitive filesystem(BUG#1531057). * src/Time.h: Renamed as TimeA2.h. * src/Time.cc: Renamed as TimeA2.cc. * src/TimeA2.h: New class. * src/TimeA2.cc: New class. * src/PeerChokeCommand.h: Replaced Time.h with TimeA2.h. * src/TrackerWatcherCommand.h: Replaced Time.h with TimeA2.h. * src/PeerAbstractCommand.h: Replaced Time.h with TimeA2.h. * src/AbstractCommand.h: Replaced Time.h with TimeA2.h. * src/PeerInteractionCommand.h: Replaced Time.h with TimeA2.h. * src/ConsoleDownloadEngine.h: Replaced Time.h with TimeA2.h. * src/TorrentAutoSaveCommand.h: Replaced Time.h with TimeA2.h. * src/DownloadCommand.h: Replaced Time.h with TimeA2.h. * src/TorrentMan.h: Replaced Time.h with TimeA2.h. * src/TorrentDownloadEngine.h: Replaced Time.h with TimeA2.h. * src/RequestSlot.h: Replaced Time.h with TimeA2.h. * src/SleepCommand.h: Replaced Time.h with TimeA2.h. * src/DownloadEngine.cc: Replaced Time.h with TimeA2.h. --- ChangeLog | 25 +- TODO | 1 - po/LINGUAS | 2 +- po/Makefile.in | 2 +- po/aria2c.pot | 12 +- po/de.gmo | Bin 20827 -> 20827 bytes po/de.po | 12 +- po/ja.gmo | Bin 24099 -> 25669 bytes po/ja.po | 32 +- po/ru.gmo | Bin 0 -> 26926 bytes po/ru.po | 909 +++++++++++++++++++++++++++++++++++ src/AbstractCommand.h | 2 +- src/ConsoleDownloadEngine.h | 2 +- src/DownloadCommand.h | 2 +- src/DownloadEngine.cc | 2 +- src/Makefile.am | 2 +- src/Makefile.in | 8 +- src/PeerAbstractCommand.h | 2 +- src/PeerChokeCommand.h | 2 +- src/PeerInteractionCommand.h | 2 +- src/RequestSlot.h | 2 +- src/SleepCommand.h | 2 +- src/{Time.cc => TimeA2.cc} | 0 src/{Time.h => TimeA2.h} | 0 src/TorrentAutoSaveCommand.h | 2 +- src/TorrentDownloadEngine.h | 2 +- src/TorrentMan.h | 2 +- src/TrackerWatcherCommand.h | 2 +- 28 files changed, 982 insertions(+), 49 deletions(-) create mode 100644 po/ru.gmo create mode 100644 po/ru.po rename src/{Time.cc => TimeA2.cc} (100%) rename src/{Time.h => TimeA2.h} (100%) diff --git a/ChangeLog b/ChangeLog index 23f08517..6e85e1f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,32 @@ -2006-08-08 Tatsuhiro Tsujikawa +2006-08-08 Tatsuhiro Tsujikawa + * po/ru.po: Azamat sent me Russian translation. + * src/FtpNegotiateCommand.cc (recvGreeting): Call disableWriteCheckSocket just after socket->setBlockingMode(). This avoids unnecessary CPU-hog loop. + Rename Time.h to TimeA2.h to avoid compilation ploblem on + case-insesitive filesystem(BUG#1531057). + + * src/Time.h: Renamed as TimeA2.h. + * src/Time.cc: Renamed as TimeA2.cc. + * src/TimeA2.h: New class. + * src/TimeA2.cc: New class. + * src/PeerChokeCommand.h: Replaced Time.h with TimeA2.h. + * src/TrackerWatcherCommand.h: Replaced Time.h with TimeA2.h. + * src/PeerAbstractCommand.h: Replaced Time.h with TimeA2.h. + * src/AbstractCommand.h: Replaced Time.h with TimeA2.h. + * src/PeerInteractionCommand.h: Replaced Time.h with TimeA2.h. + * src/ConsoleDownloadEngine.h: Replaced Time.h with TimeA2.h. + * src/TorrentAutoSaveCommand.h: Replaced Time.h with TimeA2.h. + * src/DownloadCommand.h: Replaced Time.h with TimeA2.h. + * src/TorrentMan.h: Replaced Time.h with TimeA2.h. + * src/TorrentDownloadEngine.h: Replaced Time.h with TimeA2.h. + * src/RequestSlot.h: Replaced Time.h with TimeA2.h. + * src/SleepCommand.h: Replaced Time.h with TimeA2.h. + * src/DownloadEngine.cc: Replaced Time.h with TimeA2.h. + 2006-08-07 Tatsuhiro Tsujikawa * src/PeerChokeCommand.h diff --git a/TODO b/TODO index ab8cf7c3..7e55f816 100644 --- a/TODO +++ b/TODO @@ -11,6 +11,5 @@ * Refacturing HttpConnection and FtpConnection * Query resource by location * List available os, version, etc for metalink -* rename Time to something appropriate * ipv6(RFC2428 for ftp) * add ru.po diff --git a/po/LINGUAS b/po/LINGUAS index 081e1054..d2443805 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1 @@ -ja de +ja de ru diff --git a/po/Makefile.in b/po/Makefile.in index 87322d7d..50e3b790 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -9,7 +9,7 @@ # General Public License and is *not* in the public domain. PACKAGE = aria2c -VERSION = 0.6.1 +VERSION = 0.7.0 SHELL = /bin/sh diff --git a/po/aria2c.pot b/po/aria2c.pot index 43838c16..f6b51755 100644 --- a/po/aria2c.pot +++ b/po/aria2c.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n" -"POT-Creation-Date: 2006-08-07 22:15+0900\n" +"POT-Creation-Date: 2006-08-08 01:22+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,14 +16,14 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/RequestInfo.h:76 +#: src/RequestInfo.h:84 #, c-format msgid "" "\n" "The download was complete. <%s>\n" msgstr "" -#: src/RequestInfo.h:84 +#: src/RequestInfo.h:92 msgid "" "\n" "The download was not complete because of errors. Check the log.\n" @@ -350,17 +350,17 @@ msgstr "" msgid "Files:" msgstr "" -#: src/UrlRequestInfo.cc:57 +#: src/UrlRequestInfo.cc:63 msgid "" "\n" "stopping application...\n" msgstr "" -#: src/UrlRequestInfo.cc:62 +#: src/UrlRequestInfo.cc:68 msgid "done\n" msgstr "" -#: src/UrlRequestInfo.cc:86 +#: src/UrlRequestInfo.cc:92 #, c-format msgid "Unrecognized URL or unsupported protocol: %s\n" msgstr "" diff --git a/po/de.gmo b/po/de.gmo index 95b6db136f9375302fcb8583d766e5da2158423a..6b2aaa6193d890f0253596d7f63349df33627f76 100644 GIT binary patch delta 22 ecmcb;i1GF!#trQ{>=p_JhE_&KoBMRmssI3Gln5LE delta 22 ecmcb;i1GF!#trQ{?B)taMplNVoBMRmssI3Gum~Uk diff --git a/po/de.po b/po/de.po index d1a149ce..981bbbfd 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n" -"POT-Creation-Date: 2006-08-07 22:15+0900\n" +"POT-Creation-Date: 2006-08-08 01:22+0900\n" "PO-Revision-Date: 2006-05-05 19:44+0900\n" "Last-Translator: Hermann J. Beckers \n" "Language-Team: deutsch \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3\n" -#: src/RequestInfo.h:76 +#: src/RequestInfo.h:84 #, c-format msgid "" "\n" @@ -25,7 +25,7 @@ msgstr "" "\n" "Abruf ist vollstndig. <%s>\n" -#: src/RequestInfo.h:84 +#: src/RequestInfo.h:92 msgid "" "\n" "The download was not complete because of errors. Check the log.\n" @@ -363,7 +363,7 @@ msgstr "Fehler beim Binden an Port aufgetreten.\n" msgid "Files:" msgstr "Dateien:" -#: src/UrlRequestInfo.cc:57 +#: src/UrlRequestInfo.cc:63 msgid "" "\n" "stopping application...\n" @@ -371,11 +371,11 @@ msgstr "" "\n" "Anwendung wird gestoppt ...\n" -#: src/UrlRequestInfo.cc:62 +#: src/UrlRequestInfo.cc:68 msgid "done\n" msgstr "erledigt\n" -#: src/UrlRequestInfo.cc:86 +#: src/UrlRequestInfo.cc:92 #, c-format msgid "Unrecognized URL or unsupported protocol: %s\n" msgstr "URL nicht erkannt oder nicht untersttztes Protokoll: %s\n" diff --git a/po/ja.gmo b/po/ja.gmo index 65b2505537703a54e6e1e8200f6b37a1437223e2..eda27925ca72e39b56679503b971a5d5d4e549d3 100644 GIT binary patch delta 4293 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 Yt&zN@Y1y>gdlkXFIq?>z0Fm!;sQ>@~ diff --git a/po/ja.po b/po/ja.po index d9f74590..53bdde2a 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: aria2c 0.2.1\n" "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n" -"POT-Creation-Date: 2006-08-07 22:15+0900\n" -"PO-Revision-Date: 2006-07-04 01:41+0900\n" +"POT-Creation-Date: 2006-08-08 01:22+0900\n" +"PO-Revision-Date: 2006-08-08 01:27+0900\n" "Last-Translator: Tatsuhiro Tsujikawa \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/RequestInfo.h:76 +#: src/RequestInfo.h:84 #, c-format msgid "" "\n" @@ -25,7 +25,7 @@ msgstr "" "\n" "<%s> Υɤλޤ.\n" -#: src/RequestInfo.h:84 +#: src/RequestInfo.h:92 msgid "" "\n" "The download was not complete because of errors. Check the log.\n" @@ -366,7 +366,7 @@ msgstr " msgid "Files:" msgstr "ե:" -#: src/UrlRequestInfo.cc:57 +#: src/UrlRequestInfo.cc:63 msgid "" "\n" "stopping application...\n" @@ -374,11 +374,11 @@ msgstr "" "\n" "ץꥱλƤޤ...\n" -#: src/UrlRequestInfo.cc:62 +#: src/UrlRequestInfo.cc:68 msgid "done\n" msgstr "λ\n" -#: src/UrlRequestInfo.cc:86 +#: src/UrlRequestInfo.cc:92 #, c-format msgid "Unrecognized URL or unsupported protocol: %s\n" msgstr "" @@ -513,18 +513,15 @@ msgstr "" " ޤ. ǥե: 5" #: src/main.cc:122 -#, fuzzy msgid "" " --min-segment-size=SIZE[K|M] Set minimum segment size. You can append\n" " K or M(1K = 1024, 1M = 1024K). This\n" " value must be greater than or equal to\n" " 1024. Default: 1M" msgstr "" -" --min-segment-size=SIZE[K|M] ǾΥȡꤷޤ. K ޤ " -"M\n" -" ղä뤳ȤǤޤ (1k = 1024, 1M = " -"1024K).\n" -" 1024 ʾͤꤷƤ." +" --min-segment-size=SIZE[K|M] ǾΥȡꤷޤ. K ޤ M\n" +" ղä뤳ȤǤޤ (1K = 1024, 1M = 1024K).\n" +" 1024 ʾͤꤷƤ. ǥե: 1M" #: src/main.cc:126 msgid "" @@ -663,6 +660,12 @@ msgid "" "download.\n" " Default: 0" msgstr "" +" --lowest-speed-limit ǻꤹ®٤򲼲ä, \n" +" ɤߤޤ. 0 ꤹ, ®٤Ƚ\n" +" Ԥޤ. K M --min-segment-size \n" +" ƱˡǻѤǤޤ. Υץ,\n" +" BitTorrent ɤˤϱƶޤ.\n" +" ǥե: 0" #: src/main.cc:157 msgid " -T, --torrent-file=TORRENT_FILE The file path to .torrent file." @@ -921,9 +924,8 @@ msgid "follow-metalink must be either 'true' or 'false'." msgstr "follow-metalink 'true' ޤ 'false ꤷƤ." #: src/main.cc:515 -#, fuzzy msgid "lowest-speed-limit must be greater than or equal to 0" -msgstr "upload-limit 0 ʾοꤷƤ." +msgstr "lowest-speed-limit 0 ʾοꤷƤ." #: src/main.cc:544 msgid "split must be between 1 and 5." diff --git a/po/ru.gmo b/po/ru.gmo new file mode 100644 index 0000000000000000000000000000000000000000..75afca5e5734fb2c65fa2ff3813bf8bd16df1851 GIT binary patch literal 26926 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 literal 0 HcmV?d00001 diff --git a/po/ru.po b/po/ru.po new file mode 100644 index 00000000..666936d9 --- /dev/null +++ b/po/ru.po @@ -0,0 +1,909 @@ +# translation of ru.po to +# Russian translations for aria2c package +# Английские переводы для пакета aria2c. +# Copyright (C) 2006 Tatsuhiro Tsujikawa +# This file is distributed under the same license as the aria2c package. +# +# , 2006. +# Azamat H. Hackimov , 2006. +msgid "" +msgstr "" +"Project-Id-Version: ru\n" +"Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n" +"POT-Creation-Date: 2006-08-08 01:22+0900\n" +"PO-Revision-Date: 2006-07-28 18:04+0600\n" +"Last-Translator: Azamat H. Hackimov \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: KBabel 1.11.2\n" + +#: src/RequestInfo.h:84 +#, c-format +msgid "" +"\n" +"The download was complete. <%s>\n" +msgstr "" +"\n" +"Скачивание завершено. <%s>\n" + +#: src/RequestInfo.h:92 +msgid "" +"\n" +"The download was not complete because of errors. Check the log.\n" +msgstr "" +"\n" +"Скачивание не завершено из-за ошибок. Проверьте лог-файл.\n" + +#: src/message.h:27 +#, c-format +msgid "CUID#%d - The download for one segment completed successfully." +msgstr "CUID#%d - Скачивание одного из сегментов успешно завершено." + +#: src/message.h:28 +#, c-format +msgid "CUID#%d - No segment available." +msgstr "CUID#%d - Нет доступного сегмента." + +#: src/message.h:29 +#, c-format +msgid "CUID#%d - Connecting to %s:%d" +msgstr "CUID#%d - Соединение к %s:%d" + +#: src/message.h:30 +#, c-format +msgid "" +"CUID#%d - The segment changed. We send the request again with new Range " +"header." +msgstr "" +"CUID#%d - Сегмент изменен. Отправляем новый запрос с новым заголовком " +"диапазонов." + +#: src/message.h:31 +#, c-format +msgid "CUID#%d - Redirecting to %s" +msgstr "CUID#%d - Перенаправление на %s" + +#: src/message.h:32 +#, c-format +msgid "" +"CUID#%d - Requesting:\n" +"%s" +msgstr "" +"CUID#%d - Запрос:\n" +"%s" + +#: src/message.h:33 +#, c-format +msgid "" +"CUID#%d - Response received:\n" +"%s" +msgstr "" +"CUID#%d - Получен ответ:\n" +"%s" + +#: src/message.h:34 +#, c-format +msgid "CUID#%d - Download aborted." +msgstr "CUID#%d - Скачивание отменено." + +#: src/message.h:35 +#, c-format +msgid "CUID#%d - Restarting the download." +msgstr "CUID#%d - Возобновление скачивания." + +#: src/message.h:36 +#, c-format +msgid "CUID#%d - %d times attempted, but no success. Download aborted." +msgstr "CUID#%d - Совершено %d безуспешных попыток. Скачивание отменено." + +#: src/message.h:37 +#, c-format +msgid "CUID#%d - Unregistering cuid from segmentManager." +msgstr "CUID#%d - Незарегестриованный cuid от segmentManager." + +#: src/message.h:43 +#, c-format +msgid "CUID#%d - we got new piece. index=%d" +msgstr "CUID#%d - получен новая часть. индекс=%d" + +#: src/message.h:44 +#, c-format +msgid "CUID#%d - we got wrong piece. index=%d" +msgstr "CUID#%d - получен неправильная часть. индекс=%d" + +#: src/message.h:46 +#, c-format +msgid "Tracker returned warning message: %s" +msgstr "Трекер вернул предупреждение: %s" + +#: src/message.h:48 +#, c-format +msgid "The segment file %s exists." +msgstr "Сегмент файла %s существует." + +#: src/message.h:49 +#, c-format +msgid "The segment file %s does not exist." +msgstr "Сегмент файла %s не существует." + +#: src/message.h:50 +#, c-format +msgid "Saving the segment file %s" +msgstr "Сохранение сегмента файла %s" + +#: src/message.h:51 +msgid "The segment file was saved successfully." +msgstr "Сегмент файла успешно сохранен." + +#: src/message.h:52 +#, c-format +msgid "Loading the segment file %s." +msgstr "Загрузка сегмента файл %sа" + +#: src/message.h:53 +msgid "The segment file was loaded successfully." +msgstr "Сегмент файла успешно загружен." + +#: src/message.h:55 +msgid "Timeout." +msgstr "Таймаут." + +#: src/message.h:56 +msgid "Invalid chunk size." +msgstr "Неверный размер куска." + +#: src/message.h:57 +#, c-format +msgid "Too large chunk. size=%d" +msgstr "Слишком большой кусок. размер=%d" + +#: src/message.h:58 +msgid "Invalid header." +msgstr "Неверный заголовок." + +#: src/message.h:59 +msgid "Invalid response." +msgstr "Неверный ответ." + +#: src/message.h:60 +msgid "No header found." +msgstr "Не найден заголовок." + +#: src/message.h:61 +msgid "No status header." +msgstr "Нет статуса заголовка." + +#: src/message.h:62 +msgid "Proxy connection failed." +msgstr "Ошибка подключения к прокси." + +#: src/message.h:63 +msgid "Connection failed." +msgstr "Ошибка подключения." + +#: src/message.h:64 +#, c-format +msgid "" +"The requested filename and the previously registered one are not same. %s != " +"%s" +msgstr "Запрашиваемый файл и ранее зарегистрированный не идентичны. %s != %s" + +#: src/message.h:65 +#, c-format +msgid "The response status is not successful. status=%d" +msgstr "Статус ответа - незавершенный. статус=%d" + +#: src/message.h:66 +#, c-format +msgid "Too large file size. size=%lld" +msgstr "Слишком большой размер файла. размер=%lld" + +#: src/message.h:67 +#, c-format +msgid "Transfer encoding %s is not supported." +msgstr "Кодировка передачи %s не поддерживается." + +#: src/message.h:68 +msgid "SSL initialization failed." +msgstr "Ошибка инициализации SSL." + +#: src/message.h:69 +#, c-format +msgid "Size mismatch %lld != %lld" +msgstr "Несовпадение размера %lld != %lld" + +#: src/message.h:70 +msgid "Authorization failed." +msgstr "Ошибка авторизации." + +#: src/message.h:71 +msgid "Got EOF from the server." +msgstr "От сервера получен EOF." + +#: src/message.h:72 +msgid "Got EOF from peer." +msgstr "От точки получен EOF." + +#: src/message.h:73 +msgid "Malformed meta info." +msgstr "Неверные метаданные." + +#: src/message.h:75 +#, c-format +msgid "Failed to open the file %s, cause: %s" +msgstr "Ошибка открытия файл %s: %s" + +#: src/message.h:76 +#, c-format +msgid "Failed to write into the file %s, cause: %s" +msgstr "Ошибка записи в файл %s: %s" + +#: src/message.h:77 +#, c-format +msgid "Failed to read from the file %s, cause: %s" +msgstr "Ошибка чтения из файла %s: %s" + +#: src/message.h:78 +#, c-format +msgid "Failed to calculate SHA1 digest of or a part of the file %s, cause: %s" +msgstr "Ошибка подсчета дайджеста SHA1 файла %s или его части: %s" + +#: src/message.h:79 +#, c-format +msgid "Failed to seek the file %s, cause: %s" +msgstr "Ошибка позиционирования в файле %s: %s" + +#: src/message.h:80 +#, c-format +msgid "The offset is out of range, offset=%lld" +msgstr "Вне допустимого диапазона, диапазон=%lld" + +#: src/message.h:81 +#, c-format +msgid "%s is not a directory." +msgstr "%s не является каталогом." + +#: src/message.h:82 +#, c-format +msgid "Failed to make the directory %s, cause: %s" +msgstr "Ошибка создания каталога %s: %s" + +#: src/message.h:83 +#, c-format +msgid "Failed to open the segment file %s, cause: %s" +msgstr "Ошибка открытия сегмента файла %s: %s" + +#: src/message.h:84 +#, c-format +msgid "Failed to write into the segment file %s, cause: %s" +msgstr "Ошибка записи сегмента файла %s: %s" + +#: src/message.h:85 +#, c-format +msgid "Failed to read from the segment file %s, cause: %s" +msgstr "Ошибка чтения из сегмента файла %s: %s" + +#: src/message.h:87 +#, c-format +msgid "Failed to open a socket, cause: %s" +msgstr "Ошибка открытия сокета: %s" + +#: src/message.h:88 +#, c-format +msgid "Failed to set a socket option, cause: %s" +msgstr "Ошибка установки настроек для сокета: %s" + +#: src/message.h:89 +#, c-format +msgid "Failed to bind a socket, cause: %s" +msgstr "Ошибка инициализации сокета: %s" + +#: src/message.h:90 +#, c-format +msgid "Failed to listen to a socket, cause: %s" +msgstr "Ошибка прослушивания сокета: %s" + +#: src/message.h:91 +#, c-format +msgid "Failed to accept a peer connection, cause: %s" +msgstr "Ошибка принятия подлючения от узла: %s" + +#: src/message.h:92 +#, c-format +msgid "Failed to get the name of socket, cause: %s" +msgstr "Ошибка получения имени сокета: %s" + +#: src/message.h:93 +#, c-format +msgid "Failed to get the name of connected peer, cause: %s" +msgstr "Ошибка получения имени подключенной точки: %s" + +#: src/message.h:94 +#, c-format +msgid "Failed to resolve the hostname %s, cause: %s" +msgstr "Ошибка преобразования имени узла %s: %s" + +#: src/message.h:95 +#, c-format +msgid "Failed to connect to the host %s, cause: %s" +msgstr "Ошибка подключения к узлу %s: %s" + +#: src/message.h:96 +#, c-format +msgid "Failed to check whether the socket is writable, cause: %s" +msgstr "Ошибка проверки сокета на запись: %s" + +#: src/message.h:97 +#, c-format +msgid "Failed to check whether the socket is readable, cause: %s" +msgstr "Ошибка проверки сокета на чтение: %s" + +#: src/message.h:98 +#, c-format +msgid "Failed to send data, cause: %s" +msgstr "Ошибка отправки данных: %s" + +#: src/message.h:99 +#, c-format +msgid "Failed to receive data, cause: %s" +msgstr "Ошибка получения данных: %s" + +#: src/message.h:100 +#, c-format +msgid "Failed to peek data, cause: %s" +msgstr "Ошибка запроса данных: %s" + +#: src/DownloadEngineFactory.cc:102 +msgid "Errors occurred while binding port.\n" +msgstr "Ошибка при открытии порта.\n" + +#: src/TorrentRequestInfo.cc:71 +msgid "Files:" +msgstr "Файлы:" + +#: src/UrlRequestInfo.cc:63 +msgid "" +"\n" +"stopping application...\n" +msgstr "" +"\n" +"остановка приложения...\n" + +#: src/UrlRequestInfo.cc:68 +msgid "done\n" +msgstr "завершено\n" + +#: src/UrlRequestInfo.cc:92 +#, c-format +msgid "Unrecognized URL or unsupported protocol: %s\n" +msgstr "Неправильный URL или неподдерживаемый протокол: %s\n" + +#: src/main.cc:71 +msgid " version " +msgstr " версия " + +#: src/main.cc:78 +msgid "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" +msgstr "" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 2 of the License, or\n" +"(at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful,\n" +"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program; if not, write to the Free Software\n" +"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" + +#: src/main.cc:92 +#, c-format +msgid "Contact Info: %s\n" +msgstr "Связь с автором: %s\n" + +#: src/main.cc:98 +#, c-format +msgid "Usage: %s [options] URL ...\n" +msgstr "Использование: %s [параметры] URL ...\n" + +#: src/main.cc:100 +#, c-format +msgid " %s [options] -T TORRENT_FILE FILE ...\n" +msgstr " %s [параметры] -T TORRENT_FILE FILE ...\n" + +#: src/main.cc:103 +#, c-format +msgid " %s [options] -M METALINK_FILE\n" +msgstr " %s [параметры] -M METALINK_FILE\n" + +#: src/main.cc:106 +msgid "Options:" +msgstr "Параметры:" + +#: src/main.cc:107 +msgid " -d, --dir=DIR The directory to store downloaded file." +msgstr " -d, --dir=DIR Каталог для сохранения скачанных файлов." + +#: src/main.cc:108 +msgid " -o, --out=FILE The file name for downloaded file." +msgstr " -o, --out=FILE Имя файла для скачанного файла." + +#: src/main.cc:109 +msgid "" +" -l, --log=LOG The file path to store log. If '-' is " +"specified,\n" +" log is written to stdout." +msgstr "" +" -l, --log=LOG Имя файла для логов. Если указано \"-\",\n" +" логи будут выведены в stdout." + +#: src/main.cc:111 +msgid " -D, --daemon Run as daemon." +msgstr " -D, --daemon Запустить в качестве демона." + +#: src/main.cc:112 +msgid "" +" -s, --split=N Download a file using N connections. N must " +"be\n" +" between 1 and 5. This option affects all " +"URLs.\n" +" Thus, aria2 connects to each URL with\n" +" N connections." +msgstr "" +" -s, --split=N Скачать файл, используя N соединений. N\n" +" должен быть в пределах от 1 до 5. Этот " +"параметр\n" +" влияет на все URL.\n" +" Следуя этому, aria2 соединяется к каждому URL\n" +" используя N соединений." + +#: src/main.cc:116 +msgid "" +" --retry-wait=SEC Set amount of time in second between requests\n" +" for errors. Specify a value between 0 and 60.\n" +" Default: 5" +msgstr "" +" --retry-wait=SEC Установить промежуток времени между запросами\n" +" при ошибках. Значение должно быть между 0 и " +"60.\n" +" По умолчанию: 5" + +#: src/main.cc:119 +msgid " -t, --timeout=SEC Set timeout in second. Default: 60" +msgstr "" +" -t, --timeout=SEC Установить таймаут в секундах. По умолчанию: 60" + +#: src/main.cc:120 +msgid "" +" -m, --max-tries=N Set number of tries. 0 means unlimited.\n" +" Default: 5" +msgstr "" +" -m, --max-tries=N Установить число попыток. 0 означает\n" +" неограниченное число. По умолчанию: 5" + +#: src/main.cc:122 +#, fuzzy +msgid "" +" --min-segment-size=SIZE[K|M] Set minimum segment size. You can append\n" +" K or M(1K = 1024, 1M = 1024K). This\n" +" value must be greater than or equal to\n" +" 1024. Default: 1M" +msgstr "" +" --min-segment-size=SIZE[K|M] Установить минимальный размер сегмента. Вы\n" +" можете добавить K или M (1K = 1024, 1M = " +"1024K).\n" +" Это значение должно быть больше или равно\n" +" 1024." + +#: src/main.cc:126 +msgid "" +" --http-proxy=HOST:PORT Use HTTP proxy server. This affects to all\n" +" URLs." +msgstr "" +" --http-proxy=HOST:PORT Использовать HTTP прокси-сервер. Это влияет " +"на\n" +" все URL." + +#: src/main.cc:128 +msgid " --http-user=USER Set HTTP user. This affects to all URLs." +msgstr "" +" --http-user=USER Установить пользователя для HTTP. Это влияет " +"на все URL." + +#: src/main.cc:129 +msgid "" +" --http-passwd=PASSWD Set HTTP password. This affects to all URLs." +msgstr "" +" --http-passwd=PASSWD Установить пароль для HTTP. Это влияет на все " +"URL." + +#: src/main.cc:130 +msgid "" +" --http-proxy-user=USER Set HTTP proxy user. This affects to all URLs" +msgstr "" +" --http-proxy-user=USER Установить пользователя для прокси HTTP. Это " +"влияет на все URL." + +#: src/main.cc:131 +msgid "" +" --http-proxy-passwd=PASSWD Set HTTP proxy password. This affects to all " +"URLs." +msgstr "" +" --http-proxy-passwd=PASSWD Установить пароль для прокси HTTP. Это влияет " +"на все URL." + +#: src/main.cc:132 +msgid "" +" --http-proxy-method=METHOD Set the method to use in proxy request.\n" +" METHOD is either 'get' or 'tunnel'.\n" +" Default: tunnel" +msgstr "" +" --http-proxy-method=METHOD Установить метод, используемый\n" +" в запросах к прокси. METHOD может быть \"get" +"\"\n" +" или \"tunnel\".\n" +" По умолчанию: tunnel" + +#: src/main.cc:135 +msgid "" +" --http-auth-scheme=SCHEME Set HTTP authentication scheme. Currently, " +"basic\n" +" is the only supported scheme.\n" +" Default: basic" +msgstr "" +" --http-auth-scheme=SCHEME Установить схему аутонтефикации для HTTP. На\n" +" момент доступна только схема \"basic\"\n" +" По умолчанию: basic" + +#: src/main.cc:138 +msgid " --referer=REFERER Set Referer. This affects to all URLs." +msgstr "" +" --referer=REFERER Установить реферер. Это влияет на все URL." + +#: src/main.cc:139 +msgid "" +" --ftp-user=USER Set FTP user. This affects to all URLs.\n" +" Default: anonymous" +msgstr "" +" --ftp-user=USER Установить пользователя FTP. Это влияет на все " +"URL.\n" +" По умолчанию: anonymous" + +#: src/main.cc:141 +msgid "" +" --ftp-passwd=PASSWD Set FTP password. This affects to all URLs.\n" +" Default: ARIA2USER@" +msgstr "" +" --ftp-passwd=PASSWD Установить пароль FTP. Это влияет на все URL.\n" +" По умолчанию: ARIA2USER@" + +#: src/main.cc:143 +msgid "" +" --ftp-type=TYPE Set FTP transfer type. TYPE is either " +"'binary'\n" +" or 'ascii'.\n" +" Default: binary" +msgstr "" +" --ftp-type=TYPE Установить тип передачи FTP. TYPE может быть\n" +" или \"binary\", или \"ascii\".\n" +" По умолчанию: binary" + +#: src/main.cc:146 +msgid " -p, --ftp-pasv Use passive mode in FTP." +msgstr " -p, --ftp-pasv Использовать пассивный режим для FTP." + +#: src/main.cc:147 +msgid "" +" --ftp-via-http-proxy=METHOD Use HTTP proxy in FTP. METHOD is either 'get' " +"or\n" +" 'tunnel'.\n" +" Default: tunnel" +msgstr "" +" --ftp-via-http-proxy=METHOD Использовать HTTP-прокси для FTP. METHOD " +"может\n" +" быть \"get\" или \"tunnel\".\n" +" По умолчанию: tunnel" + +#: src/main.cc:150 +msgid "" +" --lowest-speed-limit Close connection if download speed is lower " +"than\n" +" or equal to this value. 0 means aria2 does " +"not\n" +" care lowest speed limit. You can use K or M " +"in\n" +" the same manner as in --min-segment-size " +"option.\n" +" This option does not affect BitTorrent " +"download.\n" +" Default: 0" +msgstr "" + +#: src/main.cc:157 +msgid " -T, --torrent-file=TORRENT_FILE The file path to .torrent file." +msgstr " -T, --torrent-file=TORRENT_FILE Путь до .torrent-файла." + +#: src/main.cc:158 +msgid "" +" --follow-torrent=true|false Setting this option to false prevents aria2 " +"to\n" +" enter BitTorrent mode even if the filename of\n" +" downloaded file ends with .torrent.\n" +" Default: true" +msgstr "" +" --follow-torrent=true|false При установке в \"false\" aria2 не переходит " +"в\n" +" режим BitTorrent и может скачивать .torrent-\n" +" файлы.\n" +" По умолчанию: true" + +#: src/main.cc:162 +msgid "" +" -S, --show-files Print file listing of .torrent file and exit." +msgstr "" +" -S, --show-files Вывести перечисленные .torrent файлы и выйти." + +#: src/main.cc:163 +msgid "" +" --direct-file-mapping=true|false Directly read from and write to each file\n" +" mentioned in .torrent file.\n" +" Default: true" +msgstr "" +" --direct-file-mapping=true|false Напрямую прочесть и записать каждый файл,\n" +" описанный в .torrent-файл.\n" +" По умолчанию: true" + +#: src/main.cc:166 +msgid "" +" --listen-port=PORT Set port number to listen to for peer " +"connection." +msgstr "" +" --listen-port=PORT Установить порт для прослушивания соединения." + +#: src/main.cc:167 +msgid "" +" --upload-limit=SPEED Set upload speed limit in KB/sec. aria2 tries " +"to\n" +" keep upload speed under SPEED. 0 means " +"unlimited." +msgstr "" +" --upload-limit=SPEED Установить макс. скорость загрузки в KB/sec.\n" +" 0 означает неограниченную скорость." + +#: src/main.cc:169 +msgid "" +" --select-file=INDEX... Set file to download by specifing its index.\n" +" You can know file index through --show-files\n" +" option. Multiple indexes can be specified by " +"using\n" +" ',' like \"3,6\".\n" +" You can also use '-' to specify rangelike \"1-5" +"\".\n" +" ',' and '-' can be used together." +msgstr "" +" --select-file=INDEX... Указать файл для скачивания по индексу.\n" +" Вы можете узнать индекс файла с помощью " +"параметра\n" +" --show-files. Множество индексов может быть\n" +" указано через запятую (\"3,6\").\n" +" Также вы можете использовать тире (\"1-5\").\n" +" \",\" и \"-\" могут быть использованы вместе." + +#: src/main.cc:177 +msgid " -M, --metalink-file=METALINK_FILE The file path to .metalink file." +msgstr " -M, --metalink-file=METALINK_FILE Путь к .metalink-файлу." + +#: src/main.cc:178 +msgid "" +" -C, --metalink-servers=NUM_SERVERS The number of servers to connect to\n" +" simultaneously. If more than one connection " +"per\n" +" server is required, use -s option.\n" +" Default: 15" +msgstr "" +" -C, --metalink-servers=NUM_SERVERS Количество серверов для одновременного\n" +" подключения. Если требуется более одного\n" +" подключения на каждый сервер, используйте " +"параметр -s.\n" +" По умолчанию: 15" + +#: src/main.cc:182 +msgid " --metalink-version=VERSION The version of file to download." +msgstr " --metalink-version=VERSION Версия файла для скачивания." + +#: src/main.cc:183 +msgid " --metalink-language=LANGUAGE The language of file to download." +msgstr " --metalink-language=LANGUAGE Язык файла для скачивания." + +#: src/main.cc:184 +msgid "" +" --metalink-os=OS The operating system the file is targeted." +msgstr " --metalink-os=OS Целевая операционная система файла." + +#: src/main.cc:185 +msgid "" +" --follow-metalink=true|false Setting this option to false prevents aria2 " +"to\n" +" enter Metalink mode even if the filename of\n" +" downloaded file ends with .metalink.\n" +" Default: true" +msgstr "" +" --follow-metalink=true|false При установке в \"false\" aria2 не переходит " +"в\n" +" режим Metalink и может скачивать .metalink-\n" +" файлы.\n" +" По умолчанию: true" + +#: src/main.cc:190 +msgid " -v, --version Print the version number and exit." +msgstr " -v, --version Вывести номер версии и выйти." + +#: src/main.cc:191 +msgid " -h, --help Print this message and exit." +msgstr " -h, --help Вывести это сообщение и выйти." + +#: src/main.cc:194 +msgid "" +" You can specify multiple URLs. All URLs must point to the same file\n" +" or downloading fails." +msgstr "" +" Вы можете указать несколько URL. Все URL должны указывать на один и тот же\n" +" файл, иначе скачивание завершится неудачей." + +#: src/main.cc:199 +msgid "" +" Specify files in multi-file torrent to download. Use conjunction with\n" +" -T option. This arguments are ignored if you specify --select-file option." +msgstr "" +" Указать файлы для скачивания при многофайловом torent. Используйте вместе\n" +" с параметром -T. Этот параметр игнорируется при указании --select-file." + +#: src/main.cc:203 +msgid "Examples:" +msgstr "Примеры:" + +#: src/main.cc:204 +msgid " Download a file by 1 connection:" +msgstr " Скачать файл с помощью 1 соединения:" + +#: src/main.cc:206 +msgid " Download a file by 2 connections:" +msgstr " Скачать файл с помощью 2 соединений:" + +#: src/main.cc:208 +msgid " Download a file by 2 connections, each connects to a different server:" +msgstr " Скачать файл с помощью 2 соединений к различным серверам:" + +#: src/main.cc:210 +msgid " You can mix up different protocols:" +msgstr " Вы можете смешивать различные протоколы:" + +#: src/main.cc:214 +msgid " Download a torrent:" +msgstr " Скачать torrent:" + +#: src/main.cc:216 +msgid " Download a torrent using local .torrent file:" +msgstr " Скачать torrent с помощью локального .torrent-файла:" + +#: src/main.cc:218 +msgid " Download only selected files:" +msgstr " Скачать только выбранные файлы:" + +#: src/main.cc:220 +msgid " Print file listing of .torrent file:" +msgstr " Вывести список фалов из .torrent" + +#: src/main.cc:225 +msgid " Metalink downloading:" +msgstr " Скачать metalink:" + +#: src/main.cc:227 +msgid " Download a file using local .metalink file:" +msgstr " Скачать файл с помощью локального .metalink-файла:" + +#: src/main.cc:229 +msgid " Metalink downloading with preferences:" +msgstr " Скачивание metalink с настройками:" + +#: src/main.cc:233 +#, c-format +msgid "Report bugs to %s" +msgstr "Сообщения об ошибках направляйте на адрес %s" + +#: src/main.cc:358 +msgid "unrecognized proxy format" +msgstr "неизвестный формат прокси" + +#: src/main.cc:385 +msgid "Currently, supported authentication scheme is basic." +msgstr "Поддерживаемая схема аутентификации - \"basic\"." + +#: src/main.cc:394 +msgid "retry-wait must be between 0 and 60." +msgstr "retry-wait должен быть в пределах 0..60" + +#: src/main.cc:411 +msgid "ftp-type must be either 'binary' or 'ascii'." +msgstr "ftp-type должен быть \"binary\" или \"ascii\"." + +#: src/main.cc:420 +msgid "ftp-via-http-proxy must be either 'get' or 'tunnel'." +msgstr "ftp-via-http-proxy должен быть \"get\" или \"tunnel\"." + +#: src/main.cc:428 +msgid "min-segment-size invalid" +msgstr "min-segment-size неверен" + +#: src/main.cc:439 +msgid "http-proxy-method must be either 'get' or 'tunnel'." +msgstr "http-proxy-method должен быть \"get\" или \"tunnel\"." + +#: src/main.cc:447 +msgid "listen-port must be between 1024 and 65535." +msgstr "listen-port должен быть в пределах 1024..65535." + +#: src/main.cc:460 +msgid "follow-torrent must be either 'true' or 'false'." +msgstr "follow-torrent должен быть 'true' или 'false'." + +#: src/main.cc:474 +msgid "direct-file-mapping must be either 'true' or 'false'." +msgstr "direct-file-mapping должен быть 'true' или 'false'." + +#: src/main.cc:482 +msgid "upload-limit must be greater than or equal to 0." +msgstr "upload-limit должен быть не меньше 0." + +#: src/main.cc:507 +msgid "follow-metalink must be either 'true' or 'false'." +msgstr "follow-metalink должен быть 'true' или 'false'." + +#: src/main.cc:515 +#, fuzzy +msgid "lowest-speed-limit must be greater than or equal to 0" +msgstr "upload-limit должен быть не меньше 0." + +#: src/main.cc:544 +msgid "split must be between 1 and 5." +msgstr "split должен быть находится в пределах 1..5." + +#: src/main.cc:556 +msgid "timeout must be between 1 and 600" +msgstr "таймаут должен быть в пределах 1..600" + +#: src/main.cc:565 +msgid "max-tries invalid" +msgstr "неверный max-tries" + +#: src/main.cc:587 +msgid "metalink-servers must be greater than 0." +msgstr "metalink-servers должен быть больше 0" + +#: src/main.cc:607 +msgid "specify at least one URL" +msgstr "укажите по крайней мере один URL" + +#: src/main.cc:614 +msgid "daemon failed" +msgstr "ошибка демона" diff --git a/src/AbstractCommand.h b/src/AbstractCommand.h index 6d84013d..5289d14e 100644 --- a/src/AbstractCommand.h +++ b/src/AbstractCommand.h @@ -26,7 +26,7 @@ #include "Request.h" #include "DownloadEngine.h" #include "SegmentMan.h" -#include "Time.h" +#include "TimeA2.h" class AbstractCommand : public Command { private: diff --git a/src/ConsoleDownloadEngine.h b/src/ConsoleDownloadEngine.h index f708c008..8b009f75 100644 --- a/src/ConsoleDownloadEngine.h +++ b/src/ConsoleDownloadEngine.h @@ -23,7 +23,7 @@ #define _D_CONSOLE_DOWNLOAD_ENGINE_H_ #include "DownloadEngine.h" -#include "Time.h" +#include "TimeA2.h" class ConsoleDownloadEngine : public DownloadEngine { private: diff --git a/src/DownloadCommand.h b/src/DownloadCommand.h index 9f10de02..60403adf 100644 --- a/src/DownloadCommand.h +++ b/src/DownloadCommand.h @@ -24,7 +24,7 @@ #include "AbstractCommand.h" #include "TransferEncoding.h" -#include "Time.h" +#include "TimeA2.h" using namespace std; diff --git a/src/DownloadEngine.cc b/src/DownloadEngine.cc index ab75c7f9..912381da 100644 --- a/src/DownloadEngine.cc +++ b/src/DownloadEngine.cc @@ -22,7 +22,7 @@ #include "DownloadEngine.h" #include "Util.h" #include "LogFactory.h" -#include "Time.h" +#include "TimeA2.h" #include #include #include diff --git a/src/Makefile.am b/src/Makefile.am index 9e61a607..5344ccfa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,7 +50,7 @@ SRCS = Socket.h\ messageDigest.h\ LogFactory.cc LogFactory.h\ NullLogger.h\ - Time.cc Time.h\ + TimeA2.cc TimeA2.h\ SharedHandle.h\ FeatureConfig.cc FeatureConfig.h\ DownloadEngineFactory.cc DownloadEngineFactory.h\ diff --git a/src/Makefile.in b/src/Makefile.in index 752c58b1..f542ff0c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -156,7 +156,7 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \ PreAllocationDiskWriter.h AbstractDiskWriter.cc \ AbstractDiskWriter.h File.cc File.h Option.cc Option.h \ Base64.cc Base64.h CookieBox.cc CookieBox.h messageDigest.h \ - LogFactory.cc LogFactory.h NullLogger.h Time.cc Time.h \ + LogFactory.cc LogFactory.h NullLogger.h TimeA2.cc TimeA2.h \ SharedHandle.h FeatureConfig.cc FeatureConfig.h \ DownloadEngineFactory.cc DownloadEngineFactory.h RequestInfo.h \ UrlRequestInfo.cc UrlRequestInfo.h MetaEntry.h Data.cc Data.h \ @@ -275,7 +275,7 @@ am__objects_3 = SocketCore.$(OBJEXT) Command.$(OBJEXT) \ ChunkedEncoding.$(OBJEXT) DefaultDiskWriter.$(OBJEXT) \ PreAllocationDiskWriter.$(OBJEXT) AbstractDiskWriter.$(OBJEXT) \ File.$(OBJEXT) Option.$(OBJEXT) Base64.$(OBJEXT) \ - CookieBox.$(OBJEXT) LogFactory.$(OBJEXT) Time.$(OBJEXT) \ + CookieBox.$(OBJEXT) LogFactory.$(OBJEXT) TimeA2.$(OBJEXT) \ FeatureConfig.$(OBJEXT) DownloadEngineFactory.$(OBJEXT) \ UrlRequestInfo.$(OBJEXT) $(am__objects_1) $(am__objects_2) am_libaria2c_a_OBJECTS = $(am__objects_3) @@ -465,7 +465,7 @@ SRCS = Socket.h SocketCore.cc SocketCore.h Command.cc Command.h \ PreAllocationDiskWriter.h AbstractDiskWriter.cc \ AbstractDiskWriter.h File.cc File.h Option.cc Option.h \ Base64.cc Base64.h CookieBox.cc CookieBox.h messageDigest.h \ - LogFactory.cc LogFactory.h NullLogger.h Time.cc Time.h \ + LogFactory.cc LogFactory.h NullLogger.h TimeA2.cc TimeA2.h \ SharedHandle.h FeatureConfig.cc FeatureConfig.h \ DownloadEngineFactory.cc DownloadEngineFactory.h RequestInfo.h \ UrlRequestInfo.cc UrlRequestInfo.h $(am__append_1) \ @@ -642,7 +642,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplitFirstSegmentSplitter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplitSlowestSegmentSplitter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SuggestPieceMessage.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Time.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TimeA2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TorrentAutoSaveCommand.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TorrentConsoleDownloadEngine.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TorrentDownloadEngine.Po@am__quote@ diff --git a/src/PeerAbstractCommand.h b/src/PeerAbstractCommand.h index 95d9a448..f0a71a8b 100644 --- a/src/PeerAbstractCommand.h +++ b/src/PeerAbstractCommand.h @@ -25,7 +25,7 @@ #include "Command.h" #include "Request.h" #include "TorrentDownloadEngine.h" -#include "Time.h" +#include "TimeA2.h" class PeerAbstractCommand : public Command { private: diff --git a/src/PeerChokeCommand.h b/src/PeerChokeCommand.h index c31a9f9b..c3f9b242 100644 --- a/src/PeerChokeCommand.h +++ b/src/PeerChokeCommand.h @@ -24,7 +24,7 @@ #include "Command.h" #include "TorrentDownloadEngine.h" -#include "Time.h" +#include "TimeA2.h" class PeerChokeCommand : public Command { private: diff --git a/src/PeerInteractionCommand.h b/src/PeerInteractionCommand.h index ff0abb82..8f1ae0ed 100644 --- a/src/PeerInteractionCommand.h +++ b/src/PeerInteractionCommand.h @@ -25,7 +25,7 @@ #include "PeerAbstractCommand.h" #include "PeerConnection.h" #include "PeerInteraction.h" -#include "Time.h" +#include "TimeA2.h" using namespace std; diff --git a/src/RequestSlot.h b/src/RequestSlot.h index 4946ce84..46d6a269 100644 --- a/src/RequestSlot.h +++ b/src/RequestSlot.h @@ -23,7 +23,7 @@ #define _D_REQUEST_SLOT_H_ #include "common.h" -#include "Time.h" +#include "TimeA2.h" class RequestSlot { private: diff --git a/src/SleepCommand.h b/src/SleepCommand.h index 06310daa..ecf8e676 100644 --- a/src/SleepCommand.h +++ b/src/SleepCommand.h @@ -24,7 +24,7 @@ #include "DownloadEngine.h" #include "Command.h" -#include "Time.h" +#include "TimeA2.h" class SleepCommand:public Command { private: diff --git a/src/Time.cc b/src/TimeA2.cc similarity index 100% rename from src/Time.cc rename to src/TimeA2.cc diff --git a/src/Time.h b/src/TimeA2.h similarity index 100% rename from src/Time.h rename to src/TimeA2.h diff --git a/src/TorrentAutoSaveCommand.h b/src/TorrentAutoSaveCommand.h index a770f4c2..cbf880a9 100644 --- a/src/TorrentAutoSaveCommand.h +++ b/src/TorrentAutoSaveCommand.h @@ -24,7 +24,7 @@ #include "Command.h" #include "TorrentDownloadEngine.h" -#include "Time.h" +#include "TimeA2.h" class TorrentAutoSaveCommand : public Command { private: diff --git a/src/TorrentDownloadEngine.h b/src/TorrentDownloadEngine.h index facbedf7..a2ecc634 100644 --- a/src/TorrentDownloadEngine.h +++ b/src/TorrentDownloadEngine.h @@ -24,7 +24,7 @@ #include "DownloadEngine.h" #include "TorrentMan.h" -#include "Time.h" +#include "TimeA2.h" class TorrentDownloadEngine : public DownloadEngine { private: diff --git a/src/TorrentMan.h b/src/TorrentMan.h index f9201787..219e7483 100644 --- a/src/TorrentMan.h +++ b/src/TorrentMan.h @@ -33,7 +33,7 @@ #include "FileEntry.h" #include "DiskAdaptor.h" #include "Request.h" -#include "Time.h" +#include "TimeA2.h" #include #include #include diff --git a/src/TrackerWatcherCommand.h b/src/TrackerWatcherCommand.h index fd0cccf7..c4da87f5 100644 --- a/src/TrackerWatcherCommand.h +++ b/src/TrackerWatcherCommand.h @@ -24,7 +24,7 @@ #include "Command.h" #include "TorrentDownloadEngine.h" -#include "Time.h" +#include "TimeA2.h" class TrackerWatcherCommand : public Command { private: