From 4ea9c87feac9ae62f48b2180b153926e1a16c89d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?A=20C=C5=93ur?= Date: Thu, 13 Oct 2022 22:35:10 +0800 Subject: [PATCH] fix: some typos (#3904) --- AUTHORS | 2 +- docs/Port-Forwarding-Guide.md | 2 +- docs/README.md | 2 +- docs/Release-Notes.md | 2 +- extras/encryption.txt | 2 +- gtk/ui/gtk3/PrefsDialog.ui | 2 +- gtk/ui/gtk4/PrefsDialog.ui | 2 +- libtransmission/handshake.cc | 3 ++- libtransmission/jsonsl.c | 2 +- libtransmission/peer-mgr.cc | 2 +- libtransmission/transmission.h | 4 ++-- macosx/Controller.mm | 4 ++-- macosx/CreatorWindowController.mm | 4 ++-- macosx/Credits.rtf | 2 +- macosx/Torrent.mm | 2 +- macosx/TransmissionHelp/html/usingt.html | 2 +- news/news-2.42-and-older.md | 2 +- news/news-4.0.0-beta-1.md | 6 +++--- tests/libtransmission/handshake-test.cc | 3 ++- web/src/formatter.js | 4 ++-- web/src/torrent.js | 2 +- 21 files changed, 29 insertions(+), 27 deletions(-) diff --git a/AUTHORS b/AUTHORS index 6c4c01112..e1992300d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -54,6 +54,6 @@ GTK+ Translators: Third-Party Resources: Nick Mathewson and Niels Provos for libevent. Greg Hazel of BitTorrent Inc. for libutp. - Thomas Bernard for MiniUPnP and libnatpmp. + Thomas Bernard for MiniUPnP and libnatpmp. Andy Matuschak for Sparkle. Bryan D K Jones for VDKQueue. diff --git a/docs/Port-Forwarding-Guide.md b/docs/Port-Forwarding-Guide.md index ed554cf6e..f205cf12f 100644 --- a/docs/Port-Forwarding-Guide.md +++ b/docs/Port-Forwarding-Guide.md @@ -47,7 +47,7 @@ Most routers manufactured since 2001 have either the UPnP or NAT-PMP feature. ### Forward manually through a router 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 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:'. * 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. diff --git a/docs/README.md b/docs/README.md index 7e5aedc51..2c2e4f9c8 100644 --- a/docs/README.md +++ b/docs/README.md @@ -29,7 +29,7 @@ Much of this documentation is out-of-date or could be improved. Pull requests ar * [Blocklists](./Blocklists.md) * [How to build Transmission](Building-Transmission.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) # 3. Report a problem / request a feature # diff --git a/docs/Release-Notes.md b/docs/Release-Notes.md index 75bb497c1..21ac10b5f 100644 --- a/docs/Release-Notes.md +++ b/docs/Release-Notes.md @@ -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 "Sometimes crashes at exit" * 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 * Miscellaneous bug fixes and internal enhancements diff --git a/extras/encryption.txt b/extras/encryption.txt index 4bd22de75..1ef39b6e5 100644 --- a/extras/encryption.txt +++ b/extras/encryption.txt @@ -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, 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 which he selected from the provided ones. diff --git a/gtk/ui/gtk3/PrefsDialog.ui b/gtk/ui/gtk3/PrefsDialog.ui index 141c15599..bbc0c37b1 100644 --- a/gtk/ui/gtk3/PrefsDialog.ui +++ b/gtk/ui/gtk3/PrefsDialog.ui @@ -2095,7 +2095,7 @@ To add a new primary URL, add it after a blank line. - + diff --git a/gtk/ui/gtk4/PrefsDialog.ui b/gtk/ui/gtk4/PrefsDialog.ui index a211aa483..cd2456478 100644 --- a/gtk/ui/gtk4/PrefsDialog.ui +++ b/gtk/ui/gtk4/PrefsDialog.ui @@ -1497,7 +1497,7 @@ To add a new primary URL, add it after a blank line. - + diff --git a/libtransmission/handshake.cc b/libtransmission/handshake.cc index c456cd5c2..4a48a4786 100644 --- a/libtransmission/handshake.cc +++ b/libtransmission/handshake.cc @@ -59,7 +59,8 @@ static auto constexpr CryptoProvideCrypto = int{ 2 }; // "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 -// 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; static auto constexpr VC = vc_t{}; diff --git a/libtransmission/jsonsl.c b/libtransmission/jsonsl.c index d24971aef..84860e705 100644 --- a/libtransmission/jsonsl.c +++ b/libtransmission/jsonsl.c @@ -655,7 +655,7 @@ jsonsl_feed(jsonsl_t jsn, const jsonsl_char_t *bytes, size_t nbytes) state->nelem = 0; jsn->can_insert = 1; 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 = '"'; } if (CUR_CHAR == JSONSL_T_OBJECT) { diff --git a/libtransmission/peer-mgr.cc b/libtransmission/peer-mgr.cc index b60a24e55..a699796eb 100644 --- a/libtransmission/peer-mgr.cc +++ b/libtransmission/peer-mgr.cc @@ -2403,7 +2403,7 @@ struct ComparePeerByActivity 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; } diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h index 5cb5c6873..9dd8bce1d 100644 --- a/libtransmission/transmission.h +++ b/libtransmission/transmission.h @@ -109,7 +109,7 @@ enum tr_encryption_mode 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: * -# 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 filesAdded; /* number of files added */ 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 */ diff --git a/macosx/Controller.mm b/macosx/Controller.mm index 0eb0f8a10..84ec71d1c 100644 --- a/macosx/Controller.mm +++ b/macosx/Controller.mm @@ -5190,7 +5190,7 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool 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; 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) { height = minHeight; diff --git a/macosx/CreatorWindowController.mm b/macosx/CreatorWindowController.mm index acd191084..c3acb56cc 100644 --- a/macosx/CreatorWindowController.mm +++ b/macosx/CreatorWindowController.mm @@ -199,8 +199,8 @@ NSMutableSet* creatorWindowControllerSet = nil; URLByAppendingPathComponent:[name stringByAppendingPathExtension:@"torrent"]]; if (!self.fLocation) { - //for 2.5 and earlier -#warning we still store "CreatorLocation" in Defaults.plist, and not "CreatorLocationURL" + //Compatibility with Transmission 2.5 and earlier, + //when it was "CreatorLocation" and not "CreatorLocationURL" NSString* location = [self.fDefaults stringForKey:@"CreatorLocation"]; self.fLocation = [[NSURL alloc] initFileURLWithPath:[location.stringByExpandingTildeInPath diff --git a/macosx/Credits.rtf b/macosx/Credits.rtf index d29dd63ea..c52f98460 100644 --- a/macosx/Credits.rtf +++ b/macosx/Credits.rtf @@ -150,6 +150,6 @@ \f1\b0 \ \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 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 Bryan D K Jones for VDKQueue. <{\field{\*\fldinst{HYPERLINK "https://github.com/bdkjones/VDKQueue"}}{\fldrslt https://github.com/bdkjones/VDKQueue}}>} \ No newline at end of file diff --git a/macosx/Torrent.mm b/macosx/Torrent.mm index 7781a6f9f..d3b1aa0a7 100644 --- a/macosx/Torrent.mm +++ b/macosx/Torrent.mm @@ -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*)fFlatFileList { return self.flatFileList; diff --git a/macosx/TransmissionHelp/html/usingt.html b/macosx/TransmissionHelp/html/usingt.html index 60dd835ee..646be6da5 100644 --- a/macosx/TransmissionHelp/html/usingt.html +++ b/macosx/TransmissionHelp/html/usingt.html @@ -17,7 +17,7 @@
  • Torrent files contain information about the actual file you want to download, and connect you to the swarm of peers sharing it.
    • -
  • Transmission can watch a certain folder (eg your Safari download folder) for torrent files and then open them automatically via Preferences → Transfers → General.
    • +
  • Transmission can watch a certain folder (e.g. your Safari download folder) for torrent files and then open them automatically via Preferences → Transfers → General.
  • 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.
    • diff --git a/news/news-2.42-and-older.md b/news/news-2.42-and-older.md index 7a26f612b..92526afe9 100644 --- a/news/news-2.42-and-older.md +++ b/news/news-2.42-and-older.md @@ -1380,7 +1380,7 @@ * Fixed "Progress increases every time I pause then resume" * Fixed "Sometimes crashes at exit" * 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 * Miscellaneous bug fixes and internal enhancements diff --git a/news/news-4.0.0-beta-1.md b/news/news-4.0.0-beta-1.md index 1189d0022..c6e282aca 100644 --- a/news/news-4.0.0-beta-1.md +++ b/news/news-4.0.0-beta-1.md @@ -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)) - [azy5030](https://github.com/azy5030) (Ali): - 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)) - 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)) - - 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)) - 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)) @@ -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)) - 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 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)) - 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)) diff --git a/tests/libtransmission/handshake-test.cc b/tests/libtransmission/handshake-test.cc index 8ca34ced8..6faf948ed 100644 --- a/tests/libtransmission/handshake-test.cc +++ b/tests/libtransmission/handshake-test.cc @@ -239,7 +239,8 @@ TEST_F(HandshakeTest, incomingPlaintext) // implementations[.] Next comes the 20 byte sha1 hash of the bencoded // 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 - // 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_); sendToClient(sock, PlaintextProtocolName); sendToClient(sock, ReservedBytesNoExtensions); diff --git a/web/src/formatter.js b/web/src/formatter.js index 85120141d..789e838f7 100644 --- a/web/src/formatter.js +++ b/web/src/formatter.js @@ -63,7 +63,7 @@ export const Formatter = { 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 // @return {String} human-readable string 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 * @return {String} human-readable string */ diff --git a/web/src/torrent.js b/web/src/torrent.js index 89fd86c39..d155420ce 100644 --- a/web/src/torrent.js +++ b/web/src/torrent.js @@ -383,7 +383,7 @@ export class Torrent extends EventTarget { * @return true if it passes the test, false if it fails */ test(state, tracker, search, labels) { - // flter by state... + // filter by state... let pass = this.testState(state); // maybe filter by text...