[Scummvm-cvs-logs] scummvm-tools master -> 21a59765adfa995bfa19329e1a2282a8085c51be
sev-
sev at scummvm.org
Fri Feb 12 23:34:27 CET 2016
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .
Summary:
50102a8b17 TOOLS: Fix typos
21a59765ad Merge pull request #8 from a-detiste/master
Commit: 50102a8b175c43101f2ea06fd3e8010c46b264bf
https://github.com/scummvm/scummvm-tools/commit/50102a8b175c43101f2ea06fd3e8010c46b264bf
Author: Alexandre Detiste (alexandre.detiste at gmail.com)
Date: 2016-02-12T21:33:48+01:00
Commit Message:
TOOLS: Fix typos
Changed paths:
compress.cpp
engines/mohawk/utils/stream.h
gui/pages.cpp
sound/audiostream.h
diff --git a/compress.cpp b/compress.cpp
index f5ad4ee..f62e6e0 100644
--- a/compress.cpp
+++ b/compress.cpp
@@ -1161,7 +1161,7 @@ std::string CompressionTool::getHelp() const {
if (_supportedFormats & AUDIO_MP3) {
os << "\nMP3 mode params:\n";
- os << " --lame-path <path> Path to the lame excutable to use (default:lame)\n";
+ os << " --lame-path <path> Path to the lame executable to use (default:lame)\n";
os << " -b <rate> <rate> is the minimal bitrate (default:unset)\n";
os << " -B <rate> <rate> is the maximum bitrate (default:unset)\n";
os << " --vbr LAME uses the VBR mode (default)\n";
diff --git a/engines/mohawk/utils/stream.h b/engines/mohawk/utils/stream.h
index 4d15ac1..22639f9 100644
--- a/engines/mohawk/utils/stream.h
+++ b/engines/mohawk/utils/stream.h
@@ -34,7 +34,7 @@ public:
virtual ~Stream() {}
/**
- * Returns true if any I/O failure occured.
+ * Returns true if any I/O failure occurred.
* This flag is never cleared automatically. In order to clear it,
* client code has to call clearIOFailed() explicitly.
*
diff --git a/gui/pages.cpp b/gui/pages.cpp
index 9a0b74d..025fa50 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -888,7 +888,7 @@ wxWindow *ChooseAudioOptionsMp3Page::CreatePanel(wxWindow *parent) {
/*
"\nMP3 mode params:\n"
- " --lame-path <path> Path to the lame excutable to use (default: lame)\n"
+ " --lame-path <path> Path to the lame executable to use (default: lame)\n"
" -b <rate> <rate> is the target bitrate(ABR)/minimal bitrate(VBR) (default:" minBitrDef_str "%d)\n"
" -B <rate> <rate> is the maximum VBR/ABR bitrate (default:%" maxBitrDef_str ")\n"
" --vbr LAME uses the VBR mode (default)\n"
@@ -1522,7 +1522,7 @@ wxThread::ExitCode ProcessToolThread::Entry() {
_success = true;
} catch (ToolException &err) {
wxMutexLocker lock(_output.mutex);
- _output.buffer = _output.buffer + "\nFatal Error Occured: " + err.what() + "\n";
+ _output.buffer = _output.buffer + "\nFatal Error Occurred: " + err.what() + "\n";
}
_finished = true;
return NULL;
diff --git a/sound/audiostream.h b/sound/audiostream.h
index 9c47417..0ff87e5 100644
--- a/sound/audiostream.h
+++ b/sound/audiostream.h
@@ -62,7 +62,7 @@ public:
/**
* Fill the given buffer with up to numSamples samples.
* Returns the actual number of samples read, or -1 if
- * a critical error occured (note: you *must* check if
+ * a critical error occurred (note: you *must* check if
* this value is less than what you requested, this can
* happen when the stream is fully used up).
*
Commit: 21a59765adfa995bfa19329e1a2282a8085c51be
https://github.com/scummvm/scummvm-tools/commit/21a59765adfa995bfa19329e1a2282a8085c51be
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-12T23:34:22+01:00
Commit Message:
Merge pull request #8 from a-detiste/master
TOOLS: Fix typos
Changed paths:
compress.cpp
engines/mohawk/utils/stream.h
gui/pages.cpp
sound/audiostream.h
More information about the Scummvm-git-logs
mailing list