Browse Source

Merge #9651: Fix typos

5f62e3e Fix typos (practicalswift)
0.14
Wladimir J. van der Laan 8 years ago
parent
commit
986ba005ed
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 2
      contrib/gitian-build.sh
  2. 4
      contrib/macdeploy/macdeployqtplus
  3. 2
      contrib/rpm/README.md
  4. 2
      share/certs/PrivateKeyNotes.md
  5. 2
      src/qt/bitcoingui.cpp
  6. 4
      src/qt/guiutil.cpp
  7. 2
      src/qt/guiutil.h

2
contrib/gitian-build.sh

@ -41,7 +41,7 @@ Options:
-c|--commit Indicate that the version argument is for a commit or branch -c|--commit Indicate that the version argument is for a commit or branch
-u|--url Specify the URL of the repository. Default is https://github.com/bitcoin/bitcoin -u|--url Specify the URL of the repository. Default is https://github.com/bitcoin/bitcoin
-v|--verify Verify the gitian build -v|--verify Verify the gitian build
-b|--build Do a gitiain build -b|--build Do a gitian build
-s|--sign Make signed binaries for Windows and Mac OSX -s|--sign Make signed binaries for Windows and Mac OSX
-B|--buildsign Build both signed and unsigned binaries -B|--buildsign Build both signed and unsigned binaries
-o|--os Specify which Operating Systems the build is for. Default is lwx. l for linux, w for windows, x for osx -o|--os Specify which Operating Systems the build is for. Default is lwx. l for linux, w for windows, x for osx

4
contrib/macdeploy/macdeployqtplus

@ -340,7 +340,7 @@ def deployFrameworks(frameworks, bundlePath, binaryPath, strip, verbose, deploym
# install_name_tool the new id into the binary # install_name_tool the new id into the binary
changeInstallName(framework.installName, framework.deployedInstallName, binaryPath, verbose) changeInstallName(framework.installName, framework.deployedInstallName, binaryPath, verbose)
# Copy farmework to app bundle. # Copy framework to app bundle.
deployedBinaryPath = copyFramework(framework, bundlePath, verbose) deployedBinaryPath = copyFramework(framework, bundlePath, verbose)
# Skip the rest if already was deployed. # Skip the rest if already was deployed.
if deployedBinaryPath is None: if deployedBinaryPath is None:
@ -492,7 +492,7 @@ ap.add_argument("-no-strip", dest="strip", action="store_false", default=True, h
ap.add_argument("-sign", dest="sign", action="store_true", default=False, help="sign .app bundle with codesign tool") ap.add_argument("-sign", dest="sign", action="store_true", default=False, help="sign .app bundle with codesign tool")
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") 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")
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") 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")
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") 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")
ap.add_argument("-translations-dir", nargs=1, metavar="path", default=None, help="Path to Qt's translation files") ap.add_argument("-translations-dir", nargs=1, metavar="path", default=None, help="Path to Qt's translation files")
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") 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")
ap.add_argument("-volname", nargs=1, metavar="volname", default=[], help="custom volume name for dmg") ap.add_argument("-volname", nargs=1, metavar="volname", default=[], help="custom volume name for dmg")

2
contrib/rpm/README.md

@ -31,7 +31,7 @@ through `Source23` are used.
Sources 30-39 should be reserved for SELinux related files. Currently only Sources 30-39 should be reserved for SELinux related files. Currently only
`Source30` through `Source32` are used. Until those files are in a tagged `Source30` through `Source32` are used. Until those files are in a tagged
release, the full URL specified in the RPM spec file will not work. You can get release, the full URL specified in the RPM spec file will not work. You can get
them from the git ropository where you retrieved this file. them from the git repository where you retrieved this file.
Sources 100+ are for files that are not source tarballs and are not maintained Sources 100+ are for files that are not source tarballs and are not maintained
in the bitcoin git repository. At present only an SVG version of the Bitcoin in the bitcoin git repository. At present only an SVG version of the Bitcoin

2
share/certs/PrivateKeyNotes.md

@ -2,7 +2,7 @@ Code-signing private key notes
== ==
The private keys for these certificates were generated on Gavin's main work machine, The private keys for these certificates were generated on Gavin's main work machine,
following the certificate authoritys' recommendations for generating certificate following the certificate authority's recommendations for generating certificate
signing requests. signing requests.
For OSX, the private key was generated by Keychain.app on Gavin's main work machine. For OSX, the private key was generated by Keychain.app on Gavin's main work machine.

2
src/qt/bitcoingui.cpp

@ -770,7 +770,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
if (!clientModel) if (!clientModel)
return; return;
// Prevent orphan statusbar messages (e.g. hover Quit in main menu, wait until chain-sync starts -> garbelled text) // Prevent orphan statusbar messages (e.g. hover Quit in main menu, wait until chain-sync starts -> garbled text)
statusBar()->clearMessage(); statusBar()->clearMessage();
// Acquire current block source // Acquire current block source

4
src/qt/guiutil.cpp

@ -536,7 +536,7 @@ int TableViewLastColumnResizingFixer::getAvailableWidthForColumn(int column)
return nResult; return nResult;
} }
// Make sure we don't make the columns wider than the tables viewport width. // Make sure we don't make the columns wider than the table's viewport width.
void TableViewLastColumnResizingFixer::adjustTableColumnsWidth() void TableViewLastColumnResizingFixer::adjustTableColumnsWidth()
{ {
disconnectViewHeadersSignals(); disconnectViewHeadersSignals();
@ -570,7 +570,7 @@ void TableViewLastColumnResizingFixer::on_sectionResized(int logicalIndex, int o
} }
} }
// When the tabless geometry is ready, we manually perform the stretch of the "Message" column, // When the table's geometry is ready, we manually perform the stretch of the "Message" column,
// as the "Stretch" resize mode does not allow for interactive resizing. // as the "Stretch" resize mode does not allow for interactive resizing.
void TableViewLastColumnResizingFixer::on_geometriesChanged() void TableViewLastColumnResizingFixer::on_geometriesChanged()
{ {

2
src/qt/guiutil.h

@ -140,7 +140,7 @@ namespace GUIUtil
* Also makes sure the column widths are never larger than the table's viewport. * Also makes sure the column widths are never larger than the table's viewport.
* In Qt, all columns are resizable from the right, but it's not intuitive resizing the last column from the right. * In Qt, all columns are resizable from the right, but it's not intuitive resizing the last column from the right.
* Usually our second to last columns behave as if stretched, and when on strech mode, columns aren't resizable * Usually our second to last columns behave as if stretched, and when on strech mode, columns aren't resizable
* interactively or programatically. * interactively or programmatically.
* *
* This helper object takes care of this issue. * This helper object takes care of this issue.
* *

Loading…
Cancel
Save