Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion automation/autoload/cleantags-autoload.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ blocks and redundant/duplicate tags
writing) @ http://www.malakith.net/aegiwiki
* Requires cleantags.lua to be available in automation's include folder
* The changes performed on your subtitles are guaranteed to be undo-able provided that Aegisub's undo
mechanism works. Even so, I am not resposible if it damages your subtitles permanently, so please
mechanism works. Even so, I am not responsible if it damages your subtitles permanently, so please
back up your subtitle file before applying the cleaning up

Copyright (c) 2007-2009 Muhammad Lukman Nasaruddin (aka ai-chan, Aegisub's forum member)
Expand Down
2 changes: 1 addition & 1 deletion automation/include/aegisub/re.moon
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ do_replace_fun = (re, func, str, max) ->
break
table.concat(acc, '') .. str\sub pos

-- Compiled regular expression type protoype
-- Compiled regular expression type prototype
class RegEx
-- Verify that a valid value was passed for self
_check_self: =>
Expand Down
2 changes: 1 addition & 1 deletion automation/include/cleantags.lua
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ function cleantags(text)
end
end

--[[ Remove any spaces within parenteses within override blocks except for \clip tags ]]
--[[ Remove any spaces within parentheses within override blocks except for \clip tags ]]
local comb = function(a,b,c,d,e)
if (c ~= "\\clip" and c ~= "\\iclip") or d:sub(-1):find("[,%({]") or e:sub(1,1):find("[,%)}]") then return a..b..d..e
else return a..b..d..string.char(2)..e end
Expand Down
4 changes: 2 additions & 2 deletions automation/include/karaskel-auto4.lua
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ function karaskel.preproc_line_text(meta, styles, line)
worksyl.highlights[worksyl.highlights.n] = hl

-- Detect furigana (both regular and fullwidth pipes work)
-- Furigana is stored independantly from syllables
-- Furigana is stored independently from syllables
if syltext:find("|") or syltext:find("|") then
-- Replace fullwidth pipes, they aren't regex friendly
syltext = syltext:gsub("|", "|")
Expand Down Expand Up @@ -195,7 +195,7 @@ function karaskel.preproc_line_text(meta, styles, line)
furitext = furitext:sub(unicode.charwidth(furitext,1)+1)
end

-- Some of these may seem superflous, but a furi should ideally have the same "interface" as a syllable
-- Some of these may seem superfluous, but a furi should ideally have the same "interface" as a syllable
furi.start_time = syl.start_time
furi.end_time = syl.end_time
furi.duration = syl.duration
Expand Down
2 changes: 1 addition & 1 deletion automation/v4-docs/progress-reporting.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This function has been removed. A progress dialog is always shown.

Setting the progress bar position

function aegisub.progress.set(precent)
function aegisub.progress.set(percent)

@percent (number)
The percentage completed.
Expand Down
2 changes: 1 addition & 1 deletion src/ass_file.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ void AssFile::GetResolution(int &sw, int &sh) const {
sh = GetScriptInfoAsInt("PlayResY");

// Gabest logic: default is 384x288, assume 1280x1024 if either height or
// width are that, otherwise assume 4:3 if only heigh or width are set.
// width are that, otherwise assume 4:3 if only height or width are set.
// Why 1280x1024? Who the fuck knows. Clearly just Gabest trolling everyone.
if (sw == 0 && sh == 0) {
sw = 384;
Expand Down
2 changes: 1 addition & 1 deletion src/audio_player_dsound2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ void DirectSoundPlayer2Thread::Run()
// Create DirectSound object
IDirectSound8 *ds_raw = nullptr;
if (FAILED(DirectSoundCreate8(&DSDEVID_DefaultPlayback, &ds_raw, nullptr)))
REPORT_ERROR("Cound not create DirectSound object")
REPORT_ERROR("Could not create DirectSound object")

COMObjectRetainer<IDirectSound8> ds(ds_raw);

Expand Down
2 changes: 1 addition & 1 deletion src/audio_timing_karaoke.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class AudioTimingControllerKaraoke final : public AudioTimingController {
/// Labels containing the stripped text of each syllable
std::vector<AudioLabel> labels;

/// Should changes be automatically commited?
/// Should changes be automatically committed?
bool auto_commit = OPT_GET("Audio/Auto/Commit")->GetBool();
int commit_id = -1; ///< Last commit id used for an autocommit
bool pending_changes; ///< Are there any pending changes to be committed?
Expand Down
2 changes: 1 addition & 1 deletion src/fft.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
/// @ingroup utility
///
/// Most of this code was taken from http://www.codeproject.com/audio/waveInFFT.asp
/// And rewriten by Rodrigo Braz Monteiro
/// And rewritten by Rodrigo Braz Monteiro

#include "fft.h"

Expand Down
2 changes: 1 addition & 1 deletion src/font_file_lister_coretext.mm
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ FontMatch process_descriptor(NSFontDescriptor *desc, NSString *name) {
// Some fonts have different family names for OS X and Windows, with all of
// the styles in a single family on OS X, but only bold/italic variants in
// the main family with different families for the other variants on Windows.
// For VSFilter compatiblity we want to match based on the Windows name.
// For VSFilter compatibility we want to match based on the Windows name.
if (ret.family_match) {
auto data = (__bridge_transfer NSData *)CTFontCopyTable((__bridge CTFontRef)font, kCTFontTableName, 0);
auto bytes = static_cast<const uint8_t *>(data.bytes);
Expand Down
2 changes: 1 addition & 1 deletion src/video_display.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ void VideoDisplay::SetTool(std::unique_ptr<VisualToolBase> new_tool) {
// Set the tool first to prevent repeated initialization from VideoDisplay::Render
tool = std::move(new_tool);

// Hide the tool bar first to eliminate unecessary size changes
// Hide the tool bar first to eliminate unnecessary size changes
toolBar->Show(false);
toolBar->ClearTools();
tool->SetToolbar(toolBar);
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/option.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ TEST_F(lagi_option, get_existing_option) {

TEST_F(lagi_option, get_nonexistant_option) {
agi::Options opt(conf_ok, default_opt, agi::Options::FLUSH_SKIP);
EXPECT_THROW(opt.Get("Nonexistant option"), agi::InternalError);
EXPECT_THROW(opt.Get("Nonexistent option"), agi::InternalError);
}

TEST_F(lagi_option, flush_skip) {
Expand Down
2 changes: 1 addition & 1 deletion tools/version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ s/@PLIST_BUILD_DATE@/${build_date}/g
}"

# Write it only if it's changed to avoid spurious rebuilds
# This bizzare comparison method is due to that newlines in shell variables are very exciting
# This bizarre comparison method is due to that newlines in shell variables are very exciting
case "$(cat ${version_h_path} 2> /dev/null)"
in
"${new_version_h}");;
Expand Down
Loading