d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #15923 from sledgehammer999/misc_fixes 

Misc fixes before v4.4.0
adaptive-webui-19844
sledgehammer999 3 years ago committed by GitHub
parent
f2cbb61d49 ac5a485651
commit
bdcb00a3b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dist/mac/Info.plist
  2. 2
      dist/windows/options.nsi
  3. 2
      src/base/bittorrent/torrentcontentlayout.cpp
  4. 2
      src/gui/aboutdialog.cpp
  5. 2
      src/qbittorrent.rc
  6. 2
      src/webui/www/private/views/about.html

2
dist/mac/Info.plist vendored
Unescape View File

@ -67,7 +67,7 @@
<key>NSAppleScriptEnabled</key> <key>NSAppleScriptEnabled</key>
<string>YES</string> <string>YES</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string>Copyright © 2006-2021 The qBittorrent project</string> <string>Copyright © 2006-2022 The qBittorrent project</string>
<key>UTExportedTypeDeclarations</key> <key>UTExportedTypeDeclarations</key>
<array> <array>
<dict> <dict>

2
dist/windows/options.nsi vendored
Unescape View File

@ -51,7 +51,7 @@ XPStyle on
;Installer Version Information ;Installer Version Information
VIAddVersionKey "ProductName" "qBittorrent" VIAddVersionKey "ProductName" "qBittorrent"
VIAddVersionKey "CompanyName" "The qBittorrent project" VIAddVersionKey "CompanyName" "The qBittorrent project"
VIAddVersionKey "LegalCopyright" "Copyright ©2006-2021 The qBittorrent project" VIAddVersionKey "LegalCopyright" "Copyright ©2006-2022 The qBittorrent project"
VIAddVersionKey "FileDescription" "qBittorrent - A Bittorrent Client" VIAddVersionKey "FileDescription" "qBittorrent - A Bittorrent Client"
VIAddVersionKey "FileVersion" "${PROG_VERSION}" VIAddVersionKey "FileVersion" "${PROG_VERSION}"

2
src/base/bittorrent/torrentcontentlayout.cpp
Unescape View File

@ -49,7 +49,7 @@ BitTorrent::TorrentContentLayout BitTorrent::detectContentLayout(const QStringLi
: TorrentContentLayout::Subfolder); : TorrentContentLayout::Subfolder);
} }
void BitTorrent::applyContentLayout(QStringList &filePaths, const TorrentContentLayout contentLayout, const QString &rootFolder) void BitTorrent::applyContentLayout(QStringList &filePaths, const BitTorrent::TorrentContentLayout contentLayout, const QString &rootFolder)
{ {
Q_ASSERT(!filePaths.isEmpty()); Q_ASSERT(!filePaths.isEmpty());

2
src/gui/aboutdialog.cpp
Unescape View File

@ -64,7 +64,7 @@ AboutDialog::AboutDialog(QWidget *parent)
"</table>" "</table>"
"</p>") "</p>")
.arg(tr("An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.") .arg(tr("An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.")
, tr("Copyright %1 2006-2021 The qBittorrent project").arg(QString::fromUtf8(C_COPYRIGHT)) , tr("Copyright %1 2006-2022 The qBittorrent project").arg(QString::fromUtf8(C_COPYRIGHT))
, tr("Home Page:") , tr("Home Page:")
, tr("Forum:") , tr("Forum:")
, tr("Bug Tracker:")); , tr("Bug Tracker:"));

2
src/qbittorrent.rc
Unescape View File

@ -35,7 +35,7 @@ BEGIN
VALUE "FileDescription", "qBittorrent - A Bittorrent Client" VALUE "FileDescription", "qBittorrent - A Bittorrent Client"
VALUE "FileVersion", VER_FILEVERSION_STR VALUE "FileVersion", VER_FILEVERSION_STR
VALUE "InternalName", "qbittorrent" VALUE "InternalName", "qbittorrent"
VALUE "LegalCopyright", "Copyright ©2006-2021 The qBittorrent Project" VALUE "LegalCopyright", "Copyright ©2006-2022 The qBittorrent Project"
VALUE "OriginalFilename", "qbittorrent.exe" VALUE "OriginalFilename", "qbittorrent.exe"
VALUE "ProductName", "qBittorrent" VALUE "ProductName", "qBittorrent"
VALUE "ProductVersion", VER_PRODUCTVERSION_STR VALUE "ProductVersion", VER_PRODUCTVERSION_STR

2
src/webui/www/private/views/about.html
Unescape View File

@ -5,7 +5,7 @@
<h3 id="qbittorrentVersion"></h3> <h3 id="qbittorrentVersion"></h3>
</div> </div>
<p>QBT_TR(An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.)QBT_TR[CONTEXT=AboutDialog]</p> <p>QBT_TR(An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.)QBT_TR[CONTEXT=AboutDialog]</p>
<p>Copyright © 2006-2021 The qBittorrent project</p> <p>Copyright © 2006-2022 The qBittorrent project</p>
<table> <table>
<tr> <tr>
<td>QBT_TR(Home Page:)QBT_TR[CONTEXT=AboutDialog]</td> <td>QBT_TR(Home Page:)QBT_TR[CONTEXT=AboutDialog]</td>

Write Preview
Loading…
Cancel
Save