diff --git a/TODO b/TODO index a03f6e432..e1f857cab 100644 --- a/TODO +++ b/TODO @@ -73,6 +73,7 @@ LANGUAGES UPDATED: beta5->beta6 changelog: - FEATURE: Split download tab from GUI class and cleaned up code +- FEATURE: A lot of code optimization - BUGFIX: Made torrent deletion from hard-drive safer - BUGFIX: Fixed a bug when switching from finished to downloading list - BUGFIX: Showing checking progress for paused torrents too @@ -81,3 +82,4 @@ beta5->beta6 changelog: - BUGFIX: Made finished list context menu more similar to the download list one - BUGFIX: Fixed Pause/Start action in lists context menus - BUGFIX: Display the torrent that are being checked as 'checking' in seeding list +- I18N: Removed no longer maintained Traditional chinese translation \ No newline at end of file diff --git a/src/FinishedTorrents.cpp b/src/FinishedTorrents.cpp index 2739009a5..6d081209b 100644 --- a/src/FinishedTorrents.cpp +++ b/src/FinishedTorrents.cpp @@ -32,13 +32,10 @@ #include #include -FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession){ +FinishedTorrents::FinishedTorrents(QObject *parent, bittorrent *BTSession) : parent(parent), BTSession(BTSession), nbFinished(0){ setupUi(this); actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png"))); actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png"))); - nbFinished = 0; - this->BTSession = BTSession; - this->parent = parent; connect(BTSession, SIGNAL(addedTorrent(QString, QTorrentHandle&, bool)), this, SLOT(torrentAdded(QString, QTorrentHandle&, bool))); finishedListModel = new QStandardItemModel(0,7); finishedListModel->setHeaderData(F_NAME, Qt::Horizontal, tr("Name", "i.e: file name")); diff --git a/src/FinishedTorrents.h b/src/FinishedTorrents.h index 2c1b31057..35be2156c 100644 --- a/src/FinishedTorrents.h +++ b/src/FinishedTorrents.h @@ -34,11 +34,11 @@ using namespace libtorrent; class FinishedTorrents : public QWidget, public Ui::seeding { Q_OBJECT private: + QObject *parent; bittorrent *BTSession; FinishedListDelegate *finishedListDelegate; QStandardItemModel *finishedListModel; unsigned int nbFinished; - QObject *parent; public: FinishedTorrents(QObject *parent, bittorrent *BTSession); diff --git a/src/GUI.cpp b/src/GUI.cpp index 2559b46e7..798d304e9 100644 --- a/src/GUI.cpp +++ b/src/GUI.cpp @@ -56,7 +56,7 @@ namespace fs = boost::filesystem; *****************************************************/ // Constructor -GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent) { +GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), force_exit(false) { setupUi(this); setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION))); QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent")); @@ -104,7 +104,6 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent) { // creating options options = new options_imp(this); connect(options, SIGNAL(status_changed(QString, bool)), this, SLOT(OptionsSaved(QString, bool))); - force_exit = false; BTSession = new bittorrent(); connect(BTSession, SIGNAL(fullDiskError(QTorrentHandle&)), this, SLOT(fullDiskError(QTorrentHandle&))); connect(BTSession, SIGNAL(finishedTorrent(QTorrentHandle&)), this, SLOT(finishedTorrent(QTorrentHandle&))); diff --git a/src/about_imp.h b/src/about_imp.h index 691f8b95d..db4ffff79 100644 --- a/src/about_imp.h +++ b/src/about_imp.h @@ -57,12 +57,11 @@ class about : public QDialog, private Ui::AboutDlg{ - Bulgarian: Tsvetan & Boiko Bankov (emerge_life@users.sourceforge.net)
\ - Catalan: Gekko Dam Beer (gekko04@users.sourceforge.net)
\ - Chinese (Simplified): Guo Yue (guoyue0418@hotmail.com)
\ - - Chinese (Traditional): Jeff Chen (jeff.cn.chen@gmail.com)
\ - Danish: Mathias Nielsen (comoneo@gmail.com)
\ - - Dutch: Luke Niesink (luke@lukeniesink.net)
\ + - Dutch: Luke Niesink (luke@lukeniesink.net)
\ - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
\ - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
\ - - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net)
\ + - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net)
\ - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
\ - Italian: Mirko Ferrari (mirkoferrari@gmail.com) and Ferraro Luciano (luciano.ferraro@gmail.com)
\ - Japanese: Nardog (nardog@e2umail.com)
\ @@ -74,7 +73,7 @@ class about : public QDialog, private Ui::AboutDlg{ - Russian: Nick Khazov (m2k3d0n at users.sourceforge.net)
\ - Slovak: helix84
\ - Spanish: Vicente Raul Plata Fonseca (silverxnt@users.sourceforge.net)
\ - - Swedish: Daniel Nylander (po@danielnylander.se)
\ + - Swedish: Daniel Nylander (po@danielnylander.se)
\ - Turkish: Erdem Bingöl (erdem84@gmail.com)
\ - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net)

")); te_translation->append(tr("Please contact me if you would like to translate qBittorrent into your own language.")); diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp index 5d6c41f95..31e5aec0d 100644 --- a/src/bittorrent.cpp +++ b/src/bittorrent.cpp @@ -42,10 +42,9 @@ #define ETAS_MAX_VALUES 8 // Main constructor -bittorrent::bittorrent() { +bittorrent::bittorrent() : timerScan(0), DHTEnabled(false){ // To avoid some exceptions fs::path::default_name_check(fs::no_check); - timerScan = 0; // Supported preview extensions // XXX: A bit dirty to do it this way (use mime types?) supported_preview_extensions << "AVI" << "DIVX" << "MPG" << "MPEG" << "MPE" << "MP3" << "OGG" << "WMV" << "WMA" << "RMV" << "RMVB" << "ASF" << "MOV" << "WAV" << "MP2" << "SWF" << "AC3" << "OGM" << "MP4" << "FLV" << "VOB" << "QT" << "MKV" << "AIF" << "AIFF" << "AIFC" << "MID" << "MPG" << "RA" << "RAM" << "AU" << "M4A" << "FLAC" << "M4P" << "3GP" << "AAC" << "RM" << "SWA" << "MPC" << "MPP"; @@ -57,8 +56,6 @@ bittorrent::bittorrent() { s->start_lsd(); s->start_natpmp(); s->start_upnp(); - // DHT (Trackerless), disabled until told otherwise - DHTEnabled = false; // Enabling metadata plugin s->add_extension(&create_metadata_plugin); timerAlerts = new QTimer(); diff --git a/src/bittorrent.h b/src/bittorrent.h index ee68409e3..a31359dba 100644 --- a/src/bittorrent.h +++ b/src/bittorrent.h @@ -40,10 +40,10 @@ class bittorrent : public QObject{ private: session *s; - bool DHTEnabled; QString scan_dir; QTimer *timerScan; QTimer *timerAlerts; + bool DHTEnabled; downloadThread *downloader; QStringList supported_preview_extensions; QString defaultSavePath; diff --git a/src/deleteThread.h b/src/deleteThread.h index 2e0a9d56a..af7c70c35 100644 --- a/src/deleteThread.h +++ b/src/deleteThread.h @@ -38,9 +38,7 @@ class subDeleteThread : public QThread { bool abort; public: - subDeleteThread(QObject *parent, QString save_path, QStringList files_path) : QThread(parent), save_path(save_path), files_path(files_path){ - abort = false; - } + subDeleteThread(QObject *parent, QString save_path, QStringList files_path) : QThread(parent), save_path(save_path), files_path(files_path), abort(false){} ~subDeleteThread(){ abort = true; @@ -72,9 +70,7 @@ class deleteThread : public QThread { QList subThreads; public: - deleteThread(QObject* parent) : QThread(parent){ - abort = false; - } + deleteThread(QObject* parent) : QThread(parent), abort(false){} ~deleteThread(){ mutex.lock(); diff --git a/src/downloadThread.h b/src/downloadThread.h index 3703e024e..37e7095a8 100644 --- a/src/downloadThread.h +++ b/src/downloadThread.h @@ -45,9 +45,7 @@ class subDownloadThread : public QThread { bool abort; public: - subDownloadThread(QObject *parent, QString url) : QThread(parent), url(url){ - abort = false; - } + subDownloadThread(QObject *parent, QString url) : QThread(parent), url(url), abort(false){} ~subDownloadThread(){ abort = true; @@ -146,9 +144,7 @@ class downloadThread : public QThread { void downloadFailure(QString url, QString reason); public: - downloadThread(QObject* parent) : QThread(parent){ - abort = false; - } + downloadThread(QObject* parent) : QThread(parent), abort(false){} ~downloadThread(){ mutex.lock(); diff --git a/src/downloadingTorrents.cpp b/src/downloadingTorrents.cpp index 007442eab..f03375969 100644 --- a/src/downloadingTorrents.cpp +++ b/src/downloadingTorrents.cpp @@ -33,12 +33,8 @@ #include #include -DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession) { +DownloadingTorrents::DownloadingTorrents(QObject *parent, bittorrent *BTSession) : parent(parent), BTSession(BTSession), delayedSorting(false), nbTorrents(0) { setupUi(this); - this->BTSession = BTSession; - this->parent = parent; - delayedSorting = false; - nbTorrents = 0; // Setting icons actionStart->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/play.png"))); actionPause->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/pause.png"))); diff --git a/src/downloadingTorrents.h b/src/downloadingTorrents.h index 99592a709..4533c862e 100644 --- a/src/downloadingTorrents.h +++ b/src/downloadingTorrents.h @@ -34,13 +34,13 @@ using namespace libtorrent; class DownloadingTorrents : public QWidget, public Ui::downloading{ Q_OBJECT private: + QObject *parent; bittorrent *BTSession; DLListDelegate *DLDelegate; QStandardItemModel *DLListModel; - unsigned int nbTorrents; bool delayedSorting; + unsigned int nbTorrents; Qt::SortOrder delayedSortingOrder; - QObject *parent; public: DownloadingTorrents(QObject *parent, bittorrent *BTSession); diff --git a/src/lang/qbittorrent_zh_HK.qm b/src/lang/qbittorrent_zh_HK.qm deleted file mode 100644 index 389171307..000000000 Binary files a/src/lang/qbittorrent_zh_HK.qm and /dev/null differ diff --git a/src/lang/qbittorrent_zh_HK.ts b/src/lang/qbittorrent_zh_HK.ts deleted file mode 100644 index 5997bbfef..000000000 --- a/src/lang/qbittorrent_zh_HK.ts +++ /dev/null @@ -1,3324 +0,0 @@ - - - - AboutDlg - - - About qBittorrent - 關於 qBittorrent - - - - About - 關於 - - - - Author - 作者 - - - - qBitorrent Author - qBittorrent 作者 - - - - Name: - 名稱: - - - - Country: - 國家: - - - - E-mail: - 電子郵件: - - - - Home page: - 主頁: - - - - Christophe Dumez - - - - - France - 法國 - - - - Thanks To - 感謝 - - - - Translation - 翻譯 - - - - License - 許可證 - - - - <h3><b>qBittorrent</b></h3> - - - - - A bittorrent client using Qt4 and libtorrent, programmed in C++.<br> -<br> -Copyright © 2006 by Christophe Dumez<br> -<br> <u>Home Page:</u> <i>http://qbittorrent.sourceforge.net</i><br> - bittorrent的用戶使用由C++語言編寫的Qt4和libtorrent. - -Copyright © 2006 by Christophe Dumez -主頁:http://qbittorrent.sourceforge.net - - - - qBittorrent Author - qBittorrent 作者 - - - - A bittorrent client using Qt4 and libtorrent, programmed in C++.<br> -<br> -Copyright © 2006 by Christophe Dumez<br> -<br> <u>Home Page:</u> <i>http://www.qbittorrent.org</i><br> - bittorrent的用戶使用由C++語言編寫的Qt4和libtorrent.<br> -<br> -Copyright © 2006 by Christophe Dumez<br> -<br> <u>主頁:</u> <i>http://qbittorrent.sourceforge.net</i><br> - - - - chris@qbittorrent.org - - - - - http://www.dchris.eu - - - - - Birthday: - - - - - Occupation: - - - - - 03/05/1985 - - - - - Student in computer science - - - - - Thanks to - - - - - BandwidthAllocationDialog - - - Upload limit: - - - - - Download limit: - - - - - Unlimited - Unlimited (bandwidth) - - - - - KiB/s - - - - - DLListDelegate - - - KiB/s - kB/s - - - - Dialog - - - Options -- qBittorrent - 選項 -- qBittorrent - - - - Options - 選項 - - - - Main - 常規 - - - - Save Path: - 保存路徑: - - - - Download Limit: - 下載限制: - - - - Upload Limit: - 上傳限制: - - - - Max Connects: - 最大連接數: - - - - Port range: - Port範圍: - - - - ... - ... - - - - Disable - 放棄 - - - - connections - 連接 - - - - to - 到 - - - - Proxy - Proxy - - - - Proxy Settings - Proxy設置 - - - - Server IP: - 伺服器IP: - - - - 0.0.0.0 - - - - - Port: - Port: - - - - Proxy server requires authentication - 代理伺服器需要身分驗證 - - - - Authentication - 驗證 - - - - User Name: - 用戶名: - - - - Password: - 密碼: - - - - Enable connection through a proxy server - 可使用代理伺服器連接 - - - - Language - 語言 - - - - Please choose your preferred language in the following list: - 請選擇所需語言: - - - - OK - 確認 - - - - Cancel - 取消 - - - - Language settings will take effect after restart. - 語言設置將在重新啟動本軟體後生效. - - - - Scanned Dir: - 監視目錄: - - - - Enable directory scan (auto add torrent files inside) - 可使用目錄監視功能(自動添加torrent文件) - - - - Connection Settings - 連接設置 - - - - Share ratio: - 共享比率: - - - - 1 KB DL = - 1 KB 下載限 = - - - - KB UP max. - KB 上傳最大值. - - - - Activate IP Filtering - 啟用IP過濾器 - - - - Filter Settings - 過濾器設置 - - - - ipfilter.dat URL or PATH: - ipfilter.dat路徑或網址: - - - - Start IP - 起始IP - - - - End IP - 截止IP - - - - Origin - 來源 - - - - Comment - 注釋 - - - - Apply - 應用 - - - - IP Filter - IP過濾器 - - - - Add Range - 添加IP列 - - - - Remove Range - 刪除IP列 - - - - ipfilter.dat Path: - ipfilter.dat路徑: - - - - Misc - 其他 - - - - Ask for confirmation on exit - 離開時確認 - - - - Clear finished downloads on exit - 離開時清除完成的下載 - - - - Go to systray when minimizing window - 最小化時移至systray - - - - Localization - 地方化 - - - - Language: - 語言 - - - - Behaviour - 行為 - - - - OSD - OSD - - - - Always display OSD - 永遠顯示OSD - - - - Display OSD only if window is minimized or iconified - 顯示OSD當視窗最小化 - - - - Never display OSD - 不要顯示OSD - - - - KiB/s - kB/s - - - - 1 KiB DL = - 1 KB 下傳 - - - - KiB UP max. - 最大上傳KB - - - - Preview program - - - - - Audio/Video player: - - - - - Always display systray messages - - - - - Display systray messages only when window is hidden - - - - - Never display systray messages - - - - - DHT configuration - - - - - DHT port: - - - - - <b>Note:</b> Changes will be applied after qBittorrent is restarted. - - - - - <b>Translators note:</b> If qBittorrent is not available in your language, <br/>and if you would like to translate it in your mother tongue, <br/>please contact me (chris@qbittorrent.org). - - - - - Display a torrent addition dialog everytime I add a torrent - - - - - Default save path - - - - - Disable DHT (Trackerless) - - - - - Disable Peer eXchange (PeX) - - - - - Go to systray when closing main window - - - - - Connection - - - - - Peer eXchange (PeX) - - - - - DHT (trackerless) - - - - - Torrent addition - - - - - Main window - - - - - Systray messages - - - - - Directory scan - - - - - Style (Look 'n Feel) - - - - - Plastique style (KDE like) - - - - - Cleanlooks style (GNOME like) - - - - - Motif style (default Qt style on Unix systems) - - - - - CDE style (Common Desktop Environment like) - - - - - MacOS style (MacOSX only) - - - - - Exit confirmation when the download list is not empty - - - - - Disable systray integration - - - - - WindowsXP style (Windows XP only) - - - - - Server IP or url: - - - - - Proxy type: - - - - - HTTP - - - - - SOCKS5 - - - - - Affected connections - - - - - Use proxy for connections to trackers - - - - - Use proxy for connections to regular peers - - - - - Use proxy for connections to web seeds - - - - - Use proxy for DHT messages - - - - - Encryption - - - - - Encryption state: - - - - - Enabled - - - - - Forced - - - - - Disabled - - - - - DownloadingTorrents - - - Name - i.e: file name - 名稱 - - - - Size - i.e: file size - 大小 - - - - Progress - i.e: % downloaded - 進度 - - - - DL Speed - i.e: Download speed - 下載速度 - - - - UP Speed - i.e: Upload speed - 上傳速度 - - - - Seeds/Leechs - i.e: full/partial sources - - - - - Ratio - - - - - ETA - i.e: Estimated Time of Arrival / Time left - ETA - - - - qBittorrent %1 started. - e.g: qBittorrent v0.x started. - - - - - Be careful, sharing copyrighted material without permission is against the law. - - - - - <font color='red'>%1</font> <i>was blocked</i> - x.y.z.w was blocked - - - - - Fast resume data was rejected for torrent %1, checking again... - - - - - Url seed lookup failed for url: %1, message: %2 - - - - - '%1' added to download list. - '/home/y/xxx.torrent' was added to download list. - - - - - '%1' resumed. (fast resume) - '/home/y/xxx.torrent' was resumed. (fast resume) - - - - - '%1' is already in download list. - e.g: 'xxx.avi' is already in download list. - - - - - Unable to decode torrent file: '%1' - e.g: Unable to decode torrent file: '/home/y/xxx.torrent' - - - - - This file is either corrupted or this isn't a torrent. - 該文件不是torrent文件或已經損壞. - - - - Couldn't listen on any of the given ports. - 所給端口無回應. - - - - Downloading '%1', please wait... - e.g: Downloading 'xxx.torrent', please wait... - - - - - FinishedListDelegate - - - KiB/s - - - - - FinishedTorrents - - - Finished - 完成 - - - - Name - i.e: file name - 名稱 - - - - Size - i.e: file size - 大小 - - - - Progress - i.e: % downloaded - 進度 - - - - DL Speed - i.e: Download speed - 下載速度 - - - - UP Speed - i.e: Upload speed - 上傳速度 - - - - Seeds/Leechs - i.e: full/partial sources - - - - - Status - 狀態 - - - - ETA - i.e: Estimated Time of Arrival / Time left - ETA - - - - Finished - i.e: Torrent has finished downloading - 完成 - - - - None - i.e: No error message - 無 - - - - Ratio - - - - - GUI - - - Open Torrent Files - 打開Torrent文件 - - - - Unknown - 無效 - - - - This file is either corrupted or this isn't a torrent. - 該文件不是torrent文件或已經損壞. - - - - Are you sure you want to delete all files in download list? - 確定刪除下在列表中的所有文件? - - - - &Yes - &是 - - - - &No - &否 - - - - Are you sure you want to delete the selected item(s) in download list? - 確定刪除所選中的文件? - - - - paused - 暫停 - - - - started - 開始 - - - - Finished - 完成 - - - - Checking... - 檢查中... - - - - Connecting... - 連接中... - - - - Downloading... - 下載中... - - - - Download list cleared. - 下載列表以清空. - - - - All Downloads Paused. - 暫停所有下載. - - - - All Downloads Resumed. - 重新開始所有下載. - - - - DL Speed: - 下載速度: - - - - started. - 已開始. - - - - UP Speed: - 上傳速度: - - - - Couldn't create the directory: - 無法建立目錄: - - - - Torrent Files - Torrent檔案 - - - - already in download list. - <file> already in download list. - 該文件已存在於下載列表中. - - - - added to download list. - 增加到下載列表. - - - - resumed. (fast resume) - 重新開始. (快速) - - - - Unable to decode torrent file: - 無法解碼torrent文件: - - - - removed. - <file> removed. - 移除. - - - - paused. - <file> paused. - 暫停. - - - - resumed. - <file> resumed. - 重新開始. - - - - Listening on port: - 使用端口: - - - - Are you sure? -- qBittorrent - 確定? -- qBittorrent - - - - <b>qBittorrent</b><br>DL Speed: - <b>qBittorrent</b><br>下載速度: - - - - <b>Connection Status:</b><br>Online - <b>連接狀態:</b><br>在線上 - - - - <b>Connection Status:</b><br>Firewalled?<br><i>No incoming connections...</i> - <b>連接狀態:</b><br>有防火牆?<br><i>無incoming連接...</i> - - - - <b>Connection Status:</b><br>Offline<br><i>No peers found...</i> - <b>連接狀態:</b><br>離線<br><i>無法找到任何資源...</i> - - - - has finished downloading. - 下載完畢. - - - - Couldn't listen on any of the given ports. - 所給端口無回應. - - - - None - 無 - - - - Empty search pattern - 無關鍵字 - - - - Please type a search pattern first - 請輸入關鍵字 - - - - No seach engine selected - 無選中的搜索引擎 - - - - You must select at least one search engine. - 至少選擇一個搜索引擎. - - - - Searching... - 搜索中... - - - - Could not create search plugin. - 無法建立搜索插件. - - - - Stopped - 停止 - - - - I/O Error - 輸入/輸出錯誤 - - - - Couldn't create temporary file on hard drive. - 無法在硬碟上建立臨時文件. - - - - Torrent file URL - Torrent文件URL - - - - Downloading using HTTP: - 使用HTTP下載: - - - - Torrent file URL: - Torrent文件URL: - - - - A http download failed... - http下載失敗... - - - - A http download failed, reason: - http失敗原因: - - - - Are you sure you want to quit? -- qBittorrent - 確定要退出嗎? -- qBittorrent - - - - Are you sure you want to quit qbittorrent? - 確定要退出qbittorrent嗎? - - - - Timed out - 超時 - - - - Search is finished - 搜尋結束 - - - - An error occured during search... - 搜尋發生錯誤... - - - - Search aborted - 搜尋中斷 - - - - Search returned no results - 搜尋無結果 - - - - Search is Finished - 搜尋結束 - - - - Search plugin update -- qBittorrent - 搜尋 plugin 更新 -- qBittorrent - - - - Search plugin can be updated, do you want to update it? - -Changelog: - - 搜尋 plugin 可更新, 是否更新? - - - - Sorry, update server is temporarily unavailable. - 抱歉, 更新伺服器暫時不能用 - - - - Your search plugin is already up to date. - 您的搜尋 plugin 已是最新 - - - - Results - 結果 - - - - Name - 名稱 - - - - Size - 大小 - - - - Progress - 進度 - - - - DL Speed - 下載速度 - - - - UP Speed - 上傳速度 - - - - Status - 狀態 - - - - ETA - ETA - - - - Seeders - 種子 - - - - Leechers - 不完整種子 - - - - Search engine - 搜尋引擎 - - - - Paused - 暫停 - - - - Preview process already running - - - - - There is already another preview process running. -Please close the other one first. - - - - - Download finished - - - - - has finished downloading. - <filename> has finished downloading. - 下載完畢. - - - - Search Engine - 搜索引擎 - - - - qBittorrent %1 - e.g: qBittorrent v0.x - - - - - Connection status: - - - - - Offline - - - - - No peers found... - - - - - Name - i.e: file name - 名稱 - - - - Size - i.e: file size - 大小 - - - - Progress - i.e: % downloaded - 進度 - - - - DL Speed - i.e: Download speed - 下載速度 - - - - UP Speed - i.e: Upload speed - 上傳速度 - - - - ETA - i.e: Estimated Time of Arrival / Time left - ETA - - - - Seeders - i.e: Number of full sources - 種子 - - - - Leechers - i.e: Number of partial sources - 不完整種子 - - - - qBittorrent - - - - - DL speed: %1 KiB/s - e.g: Download speed: 10 KiB/s - - - - - UP speed: %1 KiB/s - e.g: Upload speed: 10 KiB/s - - - - - Finished - i.e: Torrent has finished downloading - 完成 - - - - Checking... - i.e: Checking already downloaded parts... - 檢查中... - - - - Are you sure you want to quit? - - - - - '%1' was removed. - 'xxx.avi' was removed. - - - - - None - i.e: No error message - 無 - - - - All downloads were paused. - - - - - '%1' paused. - xxx.avi paused. - - - - - Connecting... - i.e: Connecting to the tracker... - 連接中... - - - - All downloads were resumed. - - - - - '%1' resumed. - e.g: xxx.avi resumed. - - - - - %1 has finished downloading. - e.g: xxx.avi has finished downloading. - - - - - I/O Error - i.e: Input/Output Error - 輸入/輸出錯誤 - - - - An error occured when trying to read or write %1. The disk is probably full, download has been paused - e.g: An error occured when trying to read or write xxx.avi. The disk is probably full, download has been paused - - - - - Connection Status: - - - - - Online - - - - - Firewalled? - i.e: Behind a firewall/router? - - - - - No incoming connections... - - - - - Results - i.e: Search results - 結果 - - - - An error occured (full disk?), '%1' paused. - e.g: An error occured (full disk?), 'xxx.avi' paused. - - - - - Search - 搜索 - - - - RSS - - - - - qBittorrent is bind to port: %1 - e.g: qBittorrent is bind to port: 1666 - - - - - DHT support [ON], port: %1 - - - - - DHT support [OFF] - - - - - PeX support [ON] - - - - - PeX support [OFF] - - - - - The download list is not empty. -Are you sure you want to quit qBittorrent? - - - - - Downloads - 下載 - - - - Are you sure you want to delete the selected item(s) in finished list? - - - - - UPnP support [ON] - - - - - Encryption support [ON] - - - - - Encryption support [FORCED] - - - - - Encryption support [OFF] - - - - - Alt+1 - shortcut to switch to first tab - - - - - Alt+2 - shortcut to switch to second tab - - - - - Alt+4 - shortcut to switch to fourth tab - - - - - Url download error - - - - - Couldn't download file at url: %1, reason: %2. - - - - - Are you sure you want to delete the selected item(s) from download list and from hard drive? - - - - - Are you sure you want to delete the selected item(s) from finished list and from hard drive? - - - - - '%1' was removed permanently. - 'xxx.avi' was removed permanently. - - - - - Alt+3 - shortcut to switch to third tab - - - - - Ctrl+F - shortcut to switch to search tab - - - - - MainWindow - - - Log: - 記錄: - - - - Total DL Speed: - 總下載速度: - - - - Total UP Speed: - 總上傳速度: - - - - Name - 名稱 - - - - Size - 大小 - - - - % DL - % 下載 - - - - DL Speed - 下載速度 - - - - UP Speed - 上傳速度 - - - - Status - 狀態 - - - - &Options - &選項 - - - - &Edit - &編輯 - - - - &File - &文件 - - - - &Help - &幫助 - - - - Open - 打開 - - - - Exit - 退出 - - - - Preferences - 偏好 - - - - About - 關於 - - - - Start - 開始 - - - - Pause - 暫停 - - - - Delete - 刪除 - - - - Pause All - 暫停全部 - - - - Start All - 開始全部 - - - - Documentation - 參考資料 - - - - Connexion Status - 連接狀態 - - - - Delete All - 刪除全部 - - - - Torrent Properties - Torrent所有權 - - - - Connection Status - 連接狀態 - - - - Downloads - 下載 - - - - Search - 搜索 - - - - Search Pattern: - 搜索關鍵字: - - - - Status: - 狀態: - - - - Stopped - 停止 - - - - Search Engines - 搜索引擎 - - - - Results: - 結果: - - - - Stop - 停止 - - - - Seeds - 完整種子 - - - - Leechers - 不完整種子 - - - - Search Engine - 搜索引擎 - - - - Download from URL - 通過網址下載 - - - - Download - 下載 - - - - Clear - 清除 - - - - Create torrent - 創造 torrent - - - - Update search plugin - 更新搜尋plugin - - - - Session ratio: - session 比率 - - - - Preview file - - - - - Clear log - - - - - Delete Permanently - - - - - Visit website - - - - - Report a bug - - - - - Set upload limit - - - - - Set download limit - - - - - Set global download limit - - - - - Set global upload limit - - - - - Options - 選項 - - - - PropListDelegate - - - Ignored - - - - - Normal - Normal (priority) - - - - - High - High (priority) - - - - - Maximum - Maximum (priority) - - - - - QTextEdit - - - Clear - 清除 - - - - RSS - - - Search - 搜索 - - - - Delete - 刪除 - - - - Rename - - - - - Refresh - - - - - Delete selected streams - - - - - Refresh RSS streams - - - - - Add a new RSS stream - - - - - <b>News:</b> <i>(double-click to open the link in your web browser)</i> - - - - - Add RSS stream - - - - - Refresh all streams - - - - - RSS streams: - - - - - 2 - - - - - RSSImp - - - Please type a rss stream url - - - - - Stream URL: - - - - - Please choose a new name for this stream - - - - - New stream name: - - - - - Are you sure? -- qBittorrent - 確定? -- qBittorrent - - - - &Yes - &是 - - - - &No - &否 - - - - Are you sure you want to delete this stream from the list? - - - - - Description: - - - - - url: - - - - - Last refresh: - - - - - qBittorrent - - - - - This rss feed is already in the list. - - - - - RssItem - - - No description available - - - - - RssStream - - - %1 ago - 10min ago - - - - - Never - - - - - SearchEngine - - - Name - i.e: file name - 名稱 - - - - Size - i.e: file size - 大小 - - - - Seeders - i.e: Number of full sources - 種子 - - - - Leechers - i.e: Number of partial sources - 不完整種子 - - - - Search engine - 搜尋引擎 - - - - Empty search pattern - 無關鍵字 - - - - Please type a search pattern first - 請輸入關鍵字 - - - - No search engine selected - - - - - You must select at least one search engine. - 至少選擇一個搜索引擎. - - - - Results - 結果 - - - - Searching... - 搜索中... - - - - Search plugin update -- qBittorrent - 搜尋 plugin 更新 -- qBittorrent - - - - Search plugin can be updated, do you want to update it? - -Changelog: - - 搜尋 plugin 可更新, 是否更新? - - - - &Yes - &是 - - - - &No - &否 - - - - Search plugin update - - - - - qBittorrent - - - - - Sorry, update server is temporarily unavailable. - 抱歉, 更新伺服器暫時不能用 - - - - Your search plugin is already up to date. - 您的搜尋 plugin 已是最新 - - - - Search Engine - 搜索引擎 - - - - Search has finished - - - - - An error occured during search... - 搜尋發生錯誤... - - - - Search aborted - 搜尋中斷 - - - - Search returned no results - 搜尋無結果 - - - - Results - i.e: Search results - 結果 - - - - Search plugin download error - - - - - Couldn't download search plugin update at url: %1, reason: %2. - - - - - Ui - - - Name - 名稱 - - - - Size - 大小 - - - - Progress - 進度 - - - - about - - - qBittorrent - - - - - I would like to thank the following people who volunteered to translate qBittorrent: - - - - - Please contact me if you would like to translate qBittorrent into your own language. - - - - - addTorrentDialog - - - Torrent addition dialog - - - - - Save path: - - - - - ... - ... - - - - Torrent content: - - - - - Download in correct order (slower but good for previewing) - - - - - Add to download list in paused state - - - - - Add - - - - - Cancel - 取消 - - - - Ignored - - - - - Normal - - - - - High - - - - - Maximum - - - - - authentication - - - Tracker authentication - - - - - Tracker: - - - - - Login - - - - - Username: - - - - - Password: - 密碼: - - - - Log in - - - - - Cancel - 取消 - - - - bandwidth_dlg - - - Bandwidth allocation - - - - - KiB/s - - - - - createTorrentDialog - - - Torrent Creation Tool - - - - - ... - ... - - - - Create - - - - - Cancel - 取消 - - - - Torrent file creation - - - - - Input files or directories: - - - - - Announce urls (trackers): - - - - - Comment (optional): - - - - - Private (won't be distributed on trackerless network / DHT if enabled) - - - - - Destination torrent file: - - - - - Web seeds urls (optional): - - - - - createtorrent - - - Select destination torrent file - - - - - Torrent Files - Torrent檔案 - - - - No destination path set - - - - - Please type a destination path first - - - - - No input path set - - - - - Please type an input path first - - - - - Torrent creation - - - - - Torrent was created successfully: - - - - - Select a folder to add to the torrent - - - - - Select files to add to the torrent - - - - - Please type an announce URL - - - - - Torrent creation was unsuccessful, reason: %1 - - - - - Announce URL: - Tracker URL - - - - - Please type a web seed url - - - - - Web seed URL: - - - - - downloadFromURL - - - Download Torrents from URLs - - - - - Only one URL per line - - - - - Download - 下載 - - - - Cancel - 取消 - - - - Download from urls - - - - - No URL entered - - - - - Please type at least one URL. - - - - - downloading - - - Search - 搜索 - - - - Total DL Speed: - 總下載速度: - - - - KiB/s - - - - - Session ratio: - session 比率 - - - - Total UP Speed: - 總上傳速度: - - - - Log - - - - - IP filter - - - - - Start - 開始 - - - - Pause - 暫停 - - - - Delete - 刪除 - - - - Clear - 清除 - - - - Preview file - - - - - Set upload limit - - - - - Set download limit - - - - - Delete Permanently - - - - - Torrent Properties - Torrent所有權 - - - - misc - - - Unknown - Unknown (size) - 無效 - - - - B - bytes - - - - - KiB - kibibytes (1024 bytes) - - - - - MiB - mebibytes (1024 kibibytes) - - - - - GiB - gibibytes (1024 mibibytes) - - - - - TiB - tebibytes (1024 gibibytes) - - - - - Unknown - 無效 - - - - < 1m - < 1 minute - - - - - %1m - e.g: 10minutes - - - - - %1h%2m - e.g: 3hours 5minutes - - - - - %1d%2h%3m - e.g: 2days 10hours 2minutes - - - - - options_imp - - - to - <min port> to <max port> - 到 - - - - I/O Error - 輸入/輸出錯誤 - - - - Range Start IP - - - - - Start IP: - - - - - Range End IP - - - - - End IP: - - - - - IP Range Comment - - - - - Comment: - - - - - Choose your favourite preview program - - - - - Invalid IP - - - - - This IP is invalid. - - - - - Options were saved successfully. - - - - - Choose scan directory - - - - - Choose an ipfilter.dat file - - - - - Choose a save directory - - - - - I/O Error - Input/Output Error - 輸入/輸出錯誤 - - - - Couldn't open %1 in read mode. - - - - - preview - - - Preview selection - - - - - File preview - - - - - The following files support previewing, <br>please select one of them: - - - - - Preview - - - - - Cancel - 取消 - - - - previewSelect - - - Preview impossible - - - - - Sorry, we can't preview this file - - - - - Name - 名稱 - - - - Size - 大小 - - - - Progress - 進度 - - - - properties - - - Torrent Properties - Torrent所有權 - - - - Main infos - - - - - Tracker - - - - - Trackers: - - - - - Errors: - - - - - Current tracker: - - - - - Total uploaded: - - - - - Total downloaded: - - - - - Total failed: - - - - - Torrent content - - - - - Files contained in current torrent: - - - - - OK - 確認 - - - - Size - 大小 - - - - Progress - 進度 - - - - Finished - 完成 - - - - None - Unreachable? - - - - - Unknown - 無效 - - - - Options - 選項 - - - - Download in correct order (slower but good for previewing) - - - - - Save path: - - - - - Torrent infos - - - - - Creator: - - - - - Torrent hash: - - - - - Comment: - - - - - Current session - - - - - Share ratio: - 共享比率: - - - - Trackers - - - - - New tracker - - - - - New tracker url: - - - - - Priorities: - - - - - Normal: normal priority. Download order is dependent on availability - - - - - High: higher than normal priority. Pieces are preferred over pieces with the same availability, but not over pieces with lower availability - - - - - Maximum: maximum priority, availability is disregarded, the piece is preferred over any other piece with lower priority - - - - - File name - - - - - Priority - - - - - qBittorrent - - - - - Trackers list can't be empty. - - - - - Ignored: file is not downloaded at all - - - - - Ignored - - - - - Normal - - - - - Maximum - - - - - High - - - - - Url seeds - - - - - New url seed: - - - - - This url seed is already in the list. - - - - - None - i.e: No error message - 無 - - - - New url seed - New HTTP source - - - - - The following url seeds are available for this torrent: - - - - - search_engine - - - Search - 搜索 - - - - Search Engines - 搜索引擎 - - - - Search Pattern: - 搜索關鍵字: - - - - Stop - 停止 - - - - Status: - 狀態: - - - - Stopped - 停止 - - - - Results: - 結果: - - - - Download - 下載 - - - - Clear - 清除 - - - - Update search plugin - 更新搜尋plugin - - - - seeding - - - Search - 搜索 - - - - The following torrents are finished and shared: - - - - - <u>Note:</u> It is important that you keep sharing your torrents after they are finished for the well being of the network. - - - - - Start - 開始 - - - - Pause - 暫停 - - - - Delete - 刪除 - - - - Delete Permanently - - - - - Torrent Properties - Torrent所有權 - - - - Preview file - - - - - Set upload limit - - - - - subDownloadThread - - - Host is unreachable - - - - - File was not found (404) - - - - - Connection was denied - - - - - Url is invalid - - - - - Connection forbidden (403) - - - - - Connection was not authorized (401) - - - - - Content has moved (301) - - - - - Connection failure - - - - - Connection was timed out - - - - - Incorrect network interface - - - - - Unknown error - - - - - torrentAdditionDialog - - - Unable to decode torrent file: - 無法解碼torrent文件: - - - - This file is either corrupted or this isn't a torrent. - 該文件不是torrent文件或已經損壞. - - - - Choose save path - - - - - Empty save path - - - - - Please enter a save path - - - - - Save path creation error - - - - - Could not create the save path - - - - - Invalid file selection - - - - - You must select at least one file in the torrent - - - - - File name - - - - - Size - 大小 - - - - Progress - 進度 - - - - Priority - - - - diff --git a/src/options_imp.cpp b/src/options_imp.cpp index a347fc499..eb9888a19 100644 --- a/src/options_imp.cpp +++ b/src/options_imp.cpp @@ -122,12 +122,10 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){ locales << "uk_UA"; combo_i18n->addItem((QIcon(QString::fromUtf8(":/Icons/flags/russia.png"))), QString::fromUtf8("Русский")); locales << "ru_RU"; - combo_i18n->addItem((QIcon(QString::fromUtf8(":/Icons/flags/japan.png"))), QString::fromUtf8("日本語")); - locales << "ja_JP"; + combo_i18n->addItem((QIcon(QString::fromUtf8(":/Icons/flags/japan.png"))), QString::fromUtf8("日本語")); + locales << "ja_JP"; combo_i18n->addItem((QIcon(QString::fromUtf8(":/Icons/flags/china.png"))), QString::fromUtf8("中文 (简体)")); locales << "zh_CN"; - combo_i18n->addItem((QIcon(QString::fromUtf8(":/Icons/flags/china_hong_kong.png"))), QString::fromUtf8("中文 (繁體)")); - locales << "zh_HK"; combo_i18n->addItem((QIcon(QString::fromUtf8(":/Icons/flags/south_korea.png"))), QString::fromUtf8("한글")); locales << "ko_KR"; diff --git a/src/properties_imp.cpp b/src/properties_imp.cpp index 5bb2d7bbc..c9122f21c 100644 --- a/src/properties_imp.cpp +++ b/src/properties_imp.cpp @@ -31,10 +31,8 @@ #include // Constructor -properties::properties(QWidget *parent, bittorrent *BTSession, QTorrentHandle &h): QDialog(parent), h(h){ +properties::properties(QWidget *parent, bittorrent *BTSession, QTorrentHandle &h): QDialog(parent), h(h), BTSession(BTSession), changedFilteredfiles(false), hash(h.hash()) { setupUi(this); - this->BTSession = BTSession; - changedFilteredfiles = false; lbl_priorities->setText(tr("Priorities:")+"
  • "+tr("Ignored: file is not downloaded at all")+"
  • "+tr("Normal: normal priority. Download order is dependent on availability")+"
  • "+tr("High: higher than normal priority. Pieces are preferred over pieces with the same availability, but not over pieces with lower availability")+"
  • "+tr("Maximum: maximum priority, availability is disregarded, the piece is preferred over any other piece with lower priority")+"
"); // set icons addTracker_button->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/add.png"))); @@ -66,7 +64,6 @@ properties::properties(QWidget *parent, bittorrent *BTSession, QTorrentHandle &h connect(addWS_button, SIGNAL(clicked()), this, SLOT(askWebSeed())); connect(deleteWS_button, SIGNAL(clicked()), this, SLOT(deleteSelectedUrlSeeds())); // get Infos from torrent handle - hash = h.hash(); fileName->setText(h.name()); // Torrent Infos save_path->setText(h.save_path()); diff --git a/src/properties_imp.h b/src/properties_imp.h index 26ea04608..0fd3c0ec1 100644 --- a/src/properties_imp.h +++ b/src/properties_imp.h @@ -36,13 +36,13 @@ class properties : public QDialog, private Ui::properties{ Q_OBJECT private: QTorrentHandle h; + bittorrent *BTSession; + bool changedFilteredfiles; QString hash; PropListDelegate *PropDelegate; QStandardItemModel *PropListModel; QTimer *updateInfosTimer; bool has_filtered_files; - bool changedFilteredfiles; - bittorrent *BTSession; QStringList urlSeeds; protected slots: diff --git a/src/rss.h b/src/rss.h index 19322daad..117e2d11f 100644 --- a/src/rss.h +++ b/src/rss.h @@ -59,9 +59,7 @@ class RssItem : public QObject { public: // public constructor - RssItem(const QDomElement& properties) { - read = false; - downloadLink = "none"; + RssItem(const QDomElement& properties) : read(false), downloadLink("none") { QDomElement property = properties.firstChild().toElement(); while(!property.isNull()) { if (property.tagName() == "title") @@ -116,18 +114,18 @@ class RssStream : public QObject{ private: QString title; - QString alias; QString link; QString description; QString image; QString url; + QString alias; QString filePath; QString iconPath; QList listItem; QTime lastRefresh; bool read; - bool downloadFailure; bool refreshed; + bool downloadFailure; bool currently_loading; public slots : @@ -150,13 +148,7 @@ class RssStream : public QObject{ } public: - RssStream(QString _url) { - url = _url; - alias = ""; - refreshed = false; - downloadFailure = false; - currently_loading = false; - iconPath = ":/Icons/rss.png"; + RssStream(QString _url): url(_url), alias(""), iconPath(":/Icons/rss.png"), refreshed(false), downloadFailure(false), currently_loading(false) { qDebug("RSSStream constructed"); } diff --git a/src/searchEngine.cpp b/src/searchEngine.cpp index 56eeec067..acd5b4e6b 100644 --- a/src/searchEngine.cpp +++ b/src/searchEngine.cpp @@ -42,10 +42,8 @@ #define SEARCHHISTORY_MAXSIZE 50 -SearchEngine::SearchEngine(bittorrent *BTSession, QSystemTrayIcon *myTrayIcon, bool systrayIntegration) : QWidget(), systrayIntegration(systrayIntegration){ +SearchEngine::SearchEngine(bittorrent *BTSession, QSystemTrayIcon *myTrayIcon, bool systrayIntegration) : QWidget(), BTSession(BTSession), myTrayIcon(myTrayIcon), systrayIntegration(systrayIntegration){ setupUi(this); - this->BTSession = BTSession; - this->myTrayIcon = myTrayIcon; downloader = new downloadThread(this); connect(downloader, SIGNAL(downloadFinished(QString, QString)), this, SLOT(novaUpdateDownloaded(QString, QString))); connect(downloader, SIGNAL(downloadFailure(QString, QString)), this, SLOT(handleNovaDownloadFailure(QString, QString))); diff --git a/src/src.pro b/src/src.pro index d512a8b7c..8689f4d81 100644 --- a/src/src.pro +++ b/src/src.pro @@ -123,7 +123,6 @@ TRANSLATIONS = $$LANG_PATH/qbittorrent_fr.ts \ $$LANG_PATH/qbittorrent_uk.ts \ $$LANG_PATH/qbittorrent_bg.ts \ $$LANG_PATH/qbittorrent_it.ts \ - $$LANG_PATH/qbittorrent_zh_HK.ts \ $$LANG_PATH/qbittorrent_sk.ts \ $$LANG_PATH/qbittorrent_ro.ts \ $$LANG_PATH/qbittorrent_pt.ts \