Skip to content

Commit 986ba00

Browse files
committed
Merge #9651: Fix typos
5f62e3e Fix typos (practicalswift)
2 parents 8d6447e + 5f62e3e commit 986ba00

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

contrib/gitian-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Options:
4141
-c|--commit Indicate that the version argument is for a commit or branch
4242
-u|--url Specify the URL of the repository. Default is https://github.com/bitcoin/bitcoin
4343
-v|--verify Verify the gitian build
44-
-b|--build Do a gitiain build
44+
-b|--build Do a gitian build
4545
-s|--sign Make signed binaries for Windows and Mac OSX
4646
-B|--buildsign Build both signed and unsigned binaries
4747
-o|--os Specify which Operating Systems the build is for. Default is lwx. l for linux, w for windows, x for osx

contrib/macdeploy/macdeployqtplus

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ def deployFrameworks(frameworks, bundlePath, binaryPath, strip, verbose, deploym
340340
# install_name_tool the new id into the binary
341341
changeInstallName(framework.installName, framework.deployedInstallName, binaryPath, verbose)
342342

343-
# Copy farmework to app bundle.
343+
# Copy framework to app bundle.
344344
deployedBinaryPath = copyFramework(framework, bundlePath, verbose)
345345
# Skip the rest if already was deployed.
346346
if deployedBinaryPath is None:
@@ -492,7 +492,7 @@ ap.add_argument("-no-strip", dest="strip", action="store_false", default=True, h
492492
ap.add_argument("-sign", dest="sign", action="store_true", default=False, help="sign .app bundle with codesign tool")
493493
ap.add_argument("-dmg", nargs="?", const="", metavar="basename", help="create a .dmg disk image; if basename is not specified, a camel-cased version of the app name is used")
494494
ap.add_argument("-fancy", nargs=1, metavar="plist", default=[], help="make a fancy looking disk image using the given plist file with instructions; requires -dmg to work")
495-
ap.add_argument("-add-qt-tr", nargs=1, metavar="languages", default=[], help="add Qt translation files to the bundle's ressources; the language list must be separated with commas, not with whitespace")
495+
ap.add_argument("-add-qt-tr", nargs=1, metavar="languages", default=[], help="add Qt translation files to the bundle's resources; the language list must be separated with commas, not with whitespace")
496496
ap.add_argument("-translations-dir", nargs=1, metavar="path", default=None, help="Path to Qt's translation files")
497497
ap.add_argument("-add-resources", nargs="+", metavar="path", default=[], help="list of additional files or folders to be copied into the bundle's resources; must be the last argument")
498498
ap.add_argument("-volname", nargs=1, metavar="volname", default=[], help="custom volume name for dmg")

contrib/rpm/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ through `Source23` are used.
3131
Sources 30-39 should be reserved for SELinux related files. Currently only
3232
`Source30` through `Source32` are used. Until those files are in a tagged
3333
release, the full URL specified in the RPM spec file will not work. You can get
34-
them from the git ropository where you retrieved this file.
34+
them from the git repository where you retrieved this file.
3535

3636
Sources 100+ are for files that are not source tarballs and are not maintained
3737
in the bitcoin git repository. At present only an SVG version of the Bitcoin

share/certs/PrivateKeyNotes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Code-signing private key notes
22
==
33

44
The private keys for these certificates were generated on Gavin's main work machine,
5-
following the certificate authoritys' recommendations for generating certificate
5+
following the certificate authority's recommendations for generating certificate
66
signing requests.
77

88
For OSX, the private key was generated by Keychain.app on Gavin's main work machine.

src/qt/bitcoingui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
770770
if (!clientModel)
771771
return;
772772

773-
// Prevent orphan statusbar messages (e.g. hover Quit in main menu, wait until chain-sync starts -> garbelled text)
773+
// Prevent orphan statusbar messages (e.g. hover Quit in main menu, wait until chain-sync starts -> garbled text)
774774
statusBar()->clearMessage();
775775

776776
// Acquire current block source

src/qt/guiutil.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ int TableViewLastColumnResizingFixer::getAvailableWidthForColumn(int column)
536536
return nResult;
537537
}
538538

539-
// Make sure we don't make the columns wider than the tables viewport width.
539+
// Make sure we don't make the columns wider than the table's viewport width.
540540
void TableViewLastColumnResizingFixer::adjustTableColumnsWidth()
541541
{
542542
disconnectViewHeadersSignals();
@@ -570,7 +570,7 @@ void TableViewLastColumnResizingFixer::on_sectionResized(int logicalIndex, int o
570570
}
571571
}
572572

573-
// When the tabless geometry is ready, we manually perform the stretch of the "Message" column,
573+
// When the table's geometry is ready, we manually perform the stretch of the "Message" column,
574574
// as the "Stretch" resize mode does not allow for interactive resizing.
575575
void TableViewLastColumnResizingFixer::on_geometriesChanged()
576576
{

src/qt/guiutil.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ namespace GUIUtil
140140
* Also makes sure the column widths are never larger than the table's viewport.
141141
* In Qt, all columns are resizable from the right, but it's not intuitive resizing the last column from the right.
142142
* Usually our second to last columns behave as if stretched, and when on strech mode, columns aren't resizable
143-
* interactively or programatically.
143+
* interactively or programmatically.
144144
*
145145
* This helper object takes care of this issue.
146146
*

0 commit comments

Comments
 (0)