mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-21 23:32:35 +00:00
Code Issues Releases Wiki Activity

fix: some typos (#3904)

Browse source
This commit is contained in:
A Cœur 2022-10-13 22:35:10 +08:00 committed by GitHub
parent 20c2fde7ae
commit 4ea9c87fea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AUTHORS
View file

@ -54,6 +54,6 @@ GTK+ Translators:
Third-Party Resources: Third-Party Resources:
Nick Mathewson and Niels Provos for libevent. <http://monkey.org/~provos/libevent/> Nick Mathewson and Niels Provos for libevent. <http://monkey.org/~provos/libevent/>
Greg Hazel of BitTorrent Inc. for libutp. <https://github.com/bittorrent/libutp> Greg Hazel of BitTorrent Inc. for libutp. <https://github.com/bittorrent/libutp>
Thomas Bernard for MiniUPnP and libnatpmp. <http://miniupnp.tuxfamily.org/> Thomas Bernard for MiniUPnP and libnatpmp. <https://miniupnp.tuxfamily.org/>
Andy Matuschak for Sparkle. <http://sparkle.andymatuschak.org/> Andy Matuschak for Sparkle. <http://sparkle.andymatuschak.org/>
Bryan D K Jones for VDKQueue. <https://github.com/bdkjones/VDKQueue> Bryan D K Jones for VDKQueue. <https://github.com/bdkjones/VDKQueue>

2
docs/Port-Forwarding-Guide.md
View file

@ -47,7 +47,7 @@ Most routers manufactured since 2001 have either the UPnP or NAT-PMP feature.
### Forward manually through a router ### Forward manually through a router
1. Find out what your IP address is. 1. Find out what your IP address is.
* *On macOS*- Go to System Preferences >> Network, double-clicking on your connection (for instance, Built-in Ethernet), and clicking the TCP/IP tab. The address is probably something like 192.168.1.100, or 10.0.1.2. The IP of your router is here too. * *On macOS*- Go to System Preferences >> Network, double-clicking on your connection (for instance, Built-in Ethernet), and clicking the TCP/IP tab. The address is probably something like 192.168.1.100, or 10.0.1.2. The IP of your router is here too.
* *On Unix*- In Ubuntu, right click the Network Manager applet in the menu bar, and select 'Connection Information'. The address is probably something like 192.168.1.2, or 10.0.1.2. * *On Unix*- In Ubuntu, right-click the Network Manager applet in the menu bar, and select 'Connection Information'. The address is probably something like 192.168.1.2, or 10.0.1.2.
* If you don't have Network Manager, open a Terminal and type 'ifconfig'. It will list information for each of your network devices. Find the one you are using, and use the number after 'inet addr:'. * If you don't have Network Manager, open a Terminal and type 'ifconfig'. It will list information for each of your network devices. Find the one you are using, and use the number after 'inet addr:'.
* Using the command "ip a" will achieve the same results in a different format. * Using the command "ip a" will achieve the same results in a different format.
2. Open Transmission, go to preferences, and enter a number for the port. It is recommended you pick a random number between 49152 and 65535. The default is 51413. Then quit Transmission. 2. Open Transmission, go to preferences, and enter a number for the port. It is recommended you pick a random number between 49152 and 65535. The default is 51413. Then quit Transmission.

2
docs/README.md
View file

@ -29,7 +29,7 @@ Much of this documentation is out-of-date or could be improved. Pull requests ar
* [Blocklists](./Blocklists.md) * [Blocklists](./Blocklists.md)
* [How to build Transmission](Building-Transmission.md) * [How to build Transmission](Building-Transmission.md)
* [RPC protocol specification](rpc-spec.md) * [RPC protocol specification](rpc-spec.md)
* [Transmisson's Peer ID and User-Agent headers](Peer-ID-and-User-Agent.md) * [Transmission's Peer ID and User-Agent headers](Peer-ID-and-User-Agent.md)
* [Peer status text explained](Peer-Status-Text.md) * [Peer status text explained](Peer-Status-Text.md)
# 3. Report a problem / request a feature # # 3. Report a problem / request a feature #

2
docs/Release-Notes.md
View file

@ -1896,7 +1896,7 @@ This is a huge listen-to-the-users release -- it uses 103 ideas from users, incl
* Fixed "Progress increases every time I pause then resume" * Fixed "Progress increases every time I pause then resume"
* Fixed "Sometimes crashes at exit" * Fixed "Sometimes crashes at exit"
* Cleaner icon * Cleaner icon
* Show all sizes in human readable form * Show all sizes in human-readable form
* Keep downloading in the background when the window is closed * Keep downloading in the background when the window is closed
* Miscellaneous bug fixes and internal enhancements * Miscellaneous bug fixes and internal enhancements

2
extras/encryption.txt
View file

@ -71,7 +71,7 @@ The remaining bits are reserved for future use.
The initiating peer A should provide all methods he supports in the bitfield, The initiating peer A should provide all methods he supports in the bitfield,
but he may choose only to provide higher encryption levels e.g. if plaintext but he may choose only to provide higher encryption levels e.g. if plaintext
isn't sufficient for it's security needs. isn't sufficient for its security needs.
The responding peer B should set a bit corresponding to the single method The responding peer B should set a bit corresponding to the single method
which he selected from the provided ones. which he selected from the provided ones.

2
gtk/ui/gtk3/PrefsDialog.ui
View file

@ -2095,7 +2095,7 @@ To add a new primary URL, add it after a blank line.</property>
<widget name="max_total_peers_label"/> <widget name="max_total_peers_label"/>
</widgets> </widgets>
</object> </object>
<object class="GtkSizeGroup" id="privary_page_labels_width_group"> <object class="GtkSizeGroup" id="privacy_page_labels_width_group">
<widgets> <widgets>
<widget name="encryption_mode_label"/> <widget name="encryption_mode_label"/>
<widget name="blocklist_check"/> <widget name="blocklist_check"/>

2
gtk/ui/gtk4/PrefsDialog.ui
View file

@ -1497,7 +1497,7 @@ To add a new primary URL, add it after a blank line.</property>
<widget name="max_total_peers_label"/> <widget name="max_total_peers_label"/>
</widgets> </widgets>
</object> </object>
<object class="GtkSizeGroup" id="privary_page_labels_width_group"> <object class="GtkSizeGroup" id="privacy_page_labels_width_group">
<widgets> <widgets>
<widget name="encryption_mode_label"/> <widget name="encryption_mode_label"/>
<widget name="blocklist_check"/> <widget name="blocklist_check"/>

3
libtransmission/handshake.cc
View file

@ -59,7 +59,8 @@ static auto constexpr CryptoProvideCrypto = int{ 2 };
// "VC is a verification constant that is used to verify whether the // "VC is a verification constant that is used to verify whether the
// other side knows S and SKEY and thus defeats replay attacks of the // other side knows S and SKEY and thus defeats replay attacks of the
// SKEY hash. As of this version VC is a String of 8 bytes set to 0x00. // SKEY hash. As of this version VC is a String of 8 bytes set to 0x00."
// https://wiki.vuze.com/w/Message_Stream_Encryption
using vc_t = std::array<std::byte, 8>; using vc_t = std::array<std::byte, 8>;
static auto constexpr VC = vc_t{}; static auto constexpr VC = vc_t{};

2
libtransmission/jsonsl.c
View file

@ -655,7 +655,7 @@ jsonsl_feed(jsonsl_t jsn, const jsonsl_char_t *bytes, size_t nbytes)
state->nelem = 0; state->nelem = 0;
jsn->can_insert = 1; jsn->can_insert = 1;
if (CUR_CHAR == '{') { if (CUR_CHAR == '{') {
/* If we're a hash, we expect a key first, which is quouted */ /* If we're a hash, we expect a key first, which is quoted */
jsn->expecting = '"'; jsn->expecting = '"';
} }
if (CUR_CHAR == JSONSL_T_OBJECT) { if (CUR_CHAR == JSONSL_T_OBJECT) {

2
libtransmission/peer-mgr.cc
View file

@ -2403,7 +2403,7 @@ struct ComparePeerByActivity
return 0; return 0;
} }
[[nodiscard]] constexpr bool operator()(tr_peer const* a, tr_peer const* b) const // less then [[nodiscard]] constexpr bool operator()(tr_peer const* a, tr_peer const* b) const // less than
{ {
return compare(a, b) < 0; return compare(a, b) < 0;
} }

4
libtransmission/transmission.h
View file

@ -109,7 +109,7 @@ enum tr_encryption_mode
size_t tr_getDefaultConfigDirToBuf(char const* appname, char* buf, size_t buflen); size_t tr_getDefaultConfigDirToBuf(char const* appname, char* buf, size_t buflen);
/** /**
* @brief returns Transmisson's default download directory. * @brief returns Transmission's default download directory.
* *
* The default download directory is determined this way: * The default download directory is determined this way:
* -# If the HOME environment variable is set, "${HOME}/Downloads" is used. * -# If the HOME environment variable is set, "${HOME}/Downloads" is used.
@ -421,7 +421,7 @@ struct tr_session_stats
uint64_t downloadedBytes; /* total down */ uint64_t downloadedBytes; /* total down */
uint64_t filesAdded; /* number of files added */ uint64_t filesAdded; /* number of files added */
uint64_t sessionCount; /* program started N times */ uint64_t sessionCount; /* program started N times */
uint64_t secondsActive; /* how long Transmisson's been running */ uint64_t secondsActive; /* how long Transmission's been running */
}; };
/** @brief Get bandwidth use statistics for the current session */ /** @brief Get bandwidth use statistics for the current session */

4
macosx/Controller.mm
View file

@ -5190,7 +5190,7 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool
height = NSHeight(self.fTableView.enclosingScrollView.frame); height = NSHeight(self.fTableView.enclosingScrollView.frame);
} }
//make sure we dont go bigger that the screen height //make sure we don't go bigger than the screen height
NSScreen* screen = self.fWindow.screen; NSScreen* screen = self.fWindow.screen;
if (screen) if (screen)
{ {
@ -5207,7 +5207,7 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool
} }
} }
//make sure we dont have zero height //make sure we don't have zero height
if (height < minHeight) if (height < minHeight)
{ {
height = minHeight; height = minHeight;

4
macosx/CreatorWindowController.mm
View file

@ -199,8 +199,8 @@ NSMutableSet* creatorWindowControllerSet = nil;
URLByAppendingPathComponent:[name stringByAppendingPathExtension:@"torrent"]]; URLByAppendingPathComponent:[name stringByAppendingPathExtension:@"torrent"]];
if (!self.fLocation) if (!self.fLocation)
{ {
//for 2.5 and earlier //Compatibility with Transmission 2.5 and earlier,
#warning we still store "CreatorLocation" in Defaults.plist, and not "CreatorLocationURL" //when it was "CreatorLocation" and not "CreatorLocationURL"
NSString* location = [self.fDefaults stringForKey:@"CreatorLocation"]; NSString* location = [self.fDefaults stringForKey:@"CreatorLocation"];
self.fLocation = [[NSURL alloc] self.fLocation = [[NSURL alloc]
initFileURLWithPath:[location.stringByExpandingTildeInPath initFileURLWithPath:[location.stringByExpandingTildeInPath

2
macosx/Credits.rtf
View file

@ -150,6 +150,6 @@
\f1\b0 \ \f1\b0 \
\cf3 \cf4 Nick Mathewson and Niels Provos for libevent. <{\field{\*\fldinst{HYPERLINK "https://libevent.org/"}}{\fldrslt https://libevent.org/}}>\cf3 \ \cf3 \cf4 Nick Mathewson and Niels Provos for libevent. <{\field{\*\fldinst{HYPERLINK "https://libevent.org/"}}{\fldrslt https://libevent.org/}}>\cf3 \
\cf4 Greg Hazel of BitTorrent Inc. for libutp. <{\field{\*\fldinst{HYPERLINK "https://github.com/bittorrent/libutp"}}{\fldrslt https://github.com/bittorrent/libutp}}>\cf3 \ \cf4 Greg Hazel of BitTorrent Inc. for libutp. <{\field{\*\fldinst{HYPERLINK "https://github.com/bittorrent/libutp"}}{\fldrslt https://github.com/bittorrent/libutp}}>\cf3 \
\cf4 Thomas Bernard for MiniUPnP and libnatpmp. <{\field{\*\fldinst{HYPERLINK "http://miniupnp.tuxfamily.org/"}}{\fldrslt http://miniupnp.tuxfamily.org/}}>\cf3 \ \cf4 Thomas Bernard for MiniUPnP and libnatpmp. <{\field{\*\fldinst{HYPERLINK "https://miniupnp.tuxfamily.org/"}}{\fldrslt https://miniupnp.tuxfamily.org/}}>\cf3 \
\cf4 Andy Matuschak for Sparkle. <{\field{\*\fldinst{HYPERLINK "https://sparkle-project.org/"}}{\fldrslt https://sparkle-project.org/}}>\cf3 \ \cf4 Andy Matuschak for Sparkle. <{\field{\*\fldinst{HYPERLINK "https://sparkle-project.org/"}}{\fldrslt https://sparkle-project.org/}}>\cf3 \
\cf4 Bryan D K Jones for VDKQueue. <{\field{\*\fldinst{HYPERLINK "https://github.com/bdkjones/VDKQueue"}}{\fldrslt https://github.com/bdkjones/VDKQueue}}>} \cf4 Bryan D K Jones for VDKQueue. <{\field{\*\fldinst{HYPERLINK "https://github.com/bdkjones/VDKQueue"}}{\fldrslt https://github.com/bdkjones/VDKQueue}}>}

2
macosx/Torrent.mm
View file

@ -2113,7 +2113,7 @@ bool trashDataFile(char const* filename, tr_error** error)
} }
} }
// For backward comatibility for previously saved Group Predicates. // For backward compatibility for previously saved Group Predicates.
- (NSArray<FileListNode*>*)fFlatFileList - (NSArray<FileListNode*>*)fFlatFileList
{ {
return self.flatFileList; return self.flatFileList;

2
macosx/TransmissionHelp/html/usingt.html
View file

@ -17,7 +17,7 @@
<ul> <ul>
<li>Torrent files contain information about the actual file you want to download, and connect you to the swarm of peers sharing it.</li> <li>Torrent files contain information about the actual file you want to download, and connect you to the swarm of peers sharing it.</li>
<li>Transmission can watch a certain folder (eg your Safari download folder) for torrent files and then open them automatically via Preferences &rarr; Transfers &rarr; General.</li> <li>Transmission can watch a certain folder (e.g. your Safari download folder) for torrent files and then open them automatically via Preferences &rarr; Transfers &rarr; General.</li>
<li>By default, Transmission deletes the original torrent file upon opening. If you remove a transfer, in order to resume it you will need to reopen the original torrent file in Transmission. Simply choose 'Save Torrent File As…' from the File menu before deletion to avoid having to download the torrent file again.</li> <li>By default, Transmission deletes the original torrent file upon opening. If you remove a transfer, in order to resume it you will need to reopen the original torrent file in Transmission. Simply choose 'Save Torrent File As…' from the File menu before deletion to avoid having to download the torrent file again.</li>

2
news/news-2.42-and-older.md
View file

@ -1380,7 +1380,7 @@
* Fixed "Progress increases every time I pause then resume" * Fixed "Progress increases every time I pause then resume"
* Fixed "Sometimes crashes at exit" * Fixed "Sometimes crashes at exit"
* Cleaner icon * Cleaner icon
* Show all sizes in human readable form * Show all sizes in human-readable form
* Keep downloading in the background when the window is closed * Keep downloading in the background when the window is closed
* Miscellaneous bug fixes and internal enhancements * Miscellaneous bug fixes and internal enhancements

6
news/news-4.0.0-beta-1.md
View file

@ -254,11 +254,11 @@ These release notes were compiled manually. Since 4.0.0 has been in development
- Added ability to filter on error status. ([#19](https://github.com/transmission/transmission/pull/19)) - Added ability to filter on error status. ([#19](https://github.com/transmission/transmission/pull/19))
- [azy5030](https://github.com/azy5030) (Ali): - [azy5030](https://github.com/azy5030) (Ali):
- Add ability to change piece size during torrent creation ([#2416](https://github.com/transmission/transmission/pull/2416)) - Add ability to change piece size during torrent creation ([#2416](https://github.com/transmission/transmission/pull/2416))
- [Coeur](https://github.com/Coeur) (A Cœur): - [Coeur](https://github.com/Coeur) (Cœur):
- macOS client icon improvements ([#3250](https://github.com/transmission/transmission/pull/3250), [#3224](https://github.com/transmission/transmission/pull/3224), [#3094](https://github.com/transmission/transmission/pull/3094), [#3065](https://github.com/transmission/transmission/pull/3065)) - macOS client icon improvements ([#3250](https://github.com/transmission/transmission/pull/3250), [#3224](https://github.com/transmission/transmission/pull/3224), [#3094](https://github.com/transmission/transmission/pull/3094), [#3065](https://github.com/transmission/transmission/pull/3065))
- Fix QuickLook ([#3001](https://github.com/transmission/transmission/pull/3001)) - Fix QuickLook ([#3001](https://github.com/transmission/transmission/pull/3001))
- Support pasting multiple magnet links ([#3087](https://github.com/transmission/transmission/pull/3087), [#3086](https://github.com/transmission/transmission/pull/3086)) - Support pasting multiple magnet links ([#3087](https://github.com/transmission/transmission/pull/3087), [#3086](https://github.com/transmission/transmission/pull/3086))
- Add "Verify Local Data" to context menu ([#3025](https://github.com/transmission/transmission/pull/3025))\ - Add "Verify Local Data" to context menu ([#3025](https://github.com/transmission/transmission/pull/3025))
- Fix build warnings, code cleanup ([#3222](https://github.com/transmission/transmission/pull/3222), [#3051](https://github.com/transmission/transmission/pull/3051), [#3031](https://github.com/transmission/transmission/pull/3031), [#3042](https://github.com/transmission/transmission/pull/3042), [#3059](https://github.com/transmission/transmission/pull/3059), [#3052](https://github.com/transmission/transmission/pull/3052), [#3041](https://github.com/transmission/transmission/pull/3041), [#2973](https://github.com/transmission/transmission/pull/2973)) - Fix build warnings, code cleanup ([#3222](https://github.com/transmission/transmission/pull/3222), [#3051](https://github.com/transmission/transmission/pull/3051), [#3031](https://github.com/transmission/transmission/pull/3031), [#3042](https://github.com/transmission/transmission/pull/3042), [#3059](https://github.com/transmission/transmission/pull/3059), [#3052](https://github.com/transmission/transmission/pull/3052), [#3041](https://github.com/transmission/transmission/pull/3041), [#2973](https://github.com/transmission/transmission/pull/2973))
- Adopt lightweight generics ([#2974](https://github.com/transmission/transmission/pull/2974)) - Adopt lightweight generics ([#2974](https://github.com/transmission/transmission/pull/2974))
- Fix 3.00 bug where the display window was incorrectly enabled on start ([#3056](https://github.com/transmission/transmission/pull/3056)) - Fix 3.00 bug where the display window was incorrectly enabled on start ([#3056](https://github.com/transmission/transmission/pull/3056))
@ -322,7 +322,7 @@ These release notes were compiled manually. Since 4.0.0 has been in development
- Update macOS group indicators ([#3183](https://github.com/transmission/transmission/pull/3183)) - Update macOS group indicators ([#3183](https://github.com/transmission/transmission/pull/3183))
- Fullscreen mode fixes ([#195](https://github.com/transmission/transmission/pull/195)) - Fullscreen mode fixes ([#195](https://github.com/transmission/transmission/pull/195))
- Fix for editing magnet links' tracker lists ([#2793](https://github.com/transmission/transmission/pull/2793)) - Fix for editing magnet links' tracker lists ([#2793](https://github.com/transmission/transmission/pull/2793))
- Fix some window drawing issuex [#3278](https://github.com/transmission/transmission/pull/3278)) - Fix some window drawing issues [#3278](https://github.com/transmission/transmission/pull/3278))
- Replace Groups indicators with dots. [#3268](https://github.com/transmission/transmission/pull/3268)) - Replace Groups indicators with dots. [#3268](https://github.com/transmission/transmission/pull/3268))
- Fix a number of UI render issues in the torrent creator window [#3205](https://github.com/transmission/transmission/pull/3268)) - Fix a number of UI render issues in the torrent creator window [#3205](https://github.com/transmission/transmission/pull/3268))
- Magnet link improvements ([#3205](https://github.com/transmission/transmission/pull/2654), [#2702](https://github.com/transmission/transmission/pull/2702)) - Magnet link improvements ([#3205](https://github.com/transmission/transmission/pull/2654), [#2702](https://github.com/transmission/transmission/pull/2702))

3
tests/libtransmission/handshake-test.cc
View file

@ -239,7 +239,8 @@ TEST_F(HandshakeTest, incomingPlaintext)
// implementations[.] Next comes the 20 byte sha1 hash of the bencoded // implementations[.] Next comes the 20 byte sha1 hash of the bencoded
// form of the info value from the metainfo file[.] After the download // form of the info value from the metainfo file[.] After the download
// hash comes the 20-byte peer id which is reported in tracker requests // hash comes the 20-byte peer id which is reported in tracker requests
// and contained in peer lists in tracker responses. // and contained in peer lists in tracker responses."
// https://www.bittorrent.org/beps/bep_0052.html
auto [io, sock] = createIncomingIo(session_); auto [io, sock] = createIncomingIo(session_);
sendToClient(sock, PlaintextProtocolName); sendToClient(sock, PlaintextProtocolName);
sendToClient(sock, ReservedBytesNoExtensions); sendToClient(sock, ReservedBytesNoExtensions);

4
web/src/formatter.js
View file

@ -63,7 +63,7 @@ export const Formatter = {
return `${this.number(n)} ${this.ngettext(msgid, msgid_plural, n)}`; return `${this.number(n)} ${this.ngettext(msgid, msgid_plural, n)}`;
}, },
// Formats the a memory size into a human-readable string // Formats a memory size into a human-readable string
// @param {Number} bytes the filesize in bytes // @param {Number} bytes the filesize in bytes
// @return {String} human-readable string // @return {String} human-readable string
mem(bytes) { mem(bytes) {
@ -113,7 +113,7 @@ export const Formatter = {
}, },
/** /**
* Formats the a disk capacity or file size into a human-readable string * Formats a disk capacity or file size into a human-readable string
* @param {Number} bytes the filesize in bytes * @param {Number} bytes the filesize in bytes
* @return {String} human-readable string * @return {String} human-readable string
*/ */

2
web/src/torrent.js
View file

@ -383,7 +383,7 @@ export class Torrent extends EventTarget {
* @return true if it passes the test, false if it fails * @return true if it passes the test, false if it fails
*/ */
test(state, tracker, search, labels) { test(state, tracker, search, labels) {
// flter by state... // filter by state...
let pass = this.testState(state); let pass = this.testState(state);
// maybe filter by text... // maybe filter by text...