From a05e38d3cb0d16105ad477a46eb67ba8f4525651 Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Mon, 28 Dec 2020 17:28:57 +0100 Subject: [PATCH] fix typos --- data/locale/en-US.ini | 10 +++++----- data/locale/zh-CN.ini | 2 +- src/switch-media.cpp | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini index 80e470e3..206ef692 100644 --- a/data/locale/en-US.ini +++ b/data/locale/en-US.ini @@ -105,7 +105,7 @@ AdvSceneSwitcher.mediaTab.timeRestriction.shorter="Time shorter" AdvSceneSwitcher.mediaTab.timeRestriction.longer="Time longer" AdvSceneSwitcher.mediaTab.timeRestriction.remainShorter="Time remaining shorter" AdvSceneSwitcher.mediaTab.timeRestriction.remainLonger="Time remaining longer" -AdvSceneSwitcher.mediaTab.entry="When {{meidaSources}} state is {{states}} and {{timeRestrictions}} {{time}} switch to {{scenes}} using {{transitions}}" +AdvSceneSwitcher.mediaTab.entry="When {{mediaSources}} state is {{states}} and {{timeRestrictions}} {{time}} switch to {{scenes}} using {{transitions}}" ; File Tab AdvSceneSwitcher.fileTab.title="File" @@ -117,7 +117,7 @@ AdvSceneSwitcher.fileTab.switchSceneBaseOnFileContent="Switch scene based on fil AdvSceneSwitcher.fileTab.remoteFileWarning="Please note that if you choose the remote option the scene switcher will try to access the remote location every x ms as specified on the General tab!" AdvSceneSwitcher.fileTab.remoteFileWarning1="Note that the scene switcher will try to access the remote location every " AdvSceneSwitcher.fileTab.remoteFileWarning2="ms" -AdvSceneSwitcher.fileTab.libcurlWarning="Failed to load libcurl! Accesssing remote files will not be possible!" +AdvSceneSwitcher.fileTab.libcurlWarning="Failed to load libcurl! Accessing remote files will not be possible!" AdvSceneSwitcher.fileTab.selectWrite="Select a file to write to ..." AdvSceneSwitcher.fileTab.selectRead="Select a file to read from ..." AdvSceneSwitcher.fileTab.textFileType="Text files (*.txt)" @@ -146,7 +146,7 @@ AdvSceneSwitcher.timeTab.thursdays="Thursdays" AdvSceneSwitcher.timeTab.fridays="Fridays" AdvSceneSwitcher.timeTab.saturdays="Saturdays" AdvSceneSwitcher.timeTab.sundays="Sundays" -AdvSceneSwitcher.timeTab.afterstart="Atfer streaming/recording start" +AdvSceneSwitcher.timeTab.afterstart="After streaming/recording start" AdvSceneSwitcher.timeTab.afterstart.tip="The time relative to the start of streaming / recording will be used" AdvSceneSwitcher.timeTab.entry="{{triggers}} at {{time}} switch to {{scenes}} using {{transitions}}" @@ -164,8 +164,8 @@ AdvSceneSwitcher.idleTab.dontSwitchIfFocus2="is in focus" ; Scene Sequence Tab AdvSceneSwitcher.sceneSequenceTab.title="Sequence" AdvSceneSwitcher.sceneSequenceTab.description="A sequence of automatic scene switches can be cancelled by either pausing/stopping the scene switcher or manually switching to a different scene" -AdvSceneSwitcher.sceneSequenceTab.save="Save Round Trips to file" -AdvSceneSwitcher.sceneSequenceTab.load="Load Round Trips from file" +AdvSceneSwitcher.sceneSequenceTab.save="Save scene sequences to file" +AdvSceneSwitcher.sceneSequenceTab.load="Load scene sequences from file" AdvSceneSwitcher.sceneSequenceTab.saveTitle="Save Scene Sequence to file ..." AdvSceneSwitcher.sceneSequenceTab.loadTitle="Select a file to read Scene Sequence from ..." AdvSceneSwitcher.sceneSequenceTab.loadFail="Advanced Scene Switcher failed to import settings!" diff --git a/data/locale/zh-CN.ini b/data/locale/zh-CN.ini index bb6f4546..5e0a1b7c 100644 --- a/data/locale/zh-CN.ini +++ b/data/locale/zh-CN.ini @@ -105,7 +105,7 @@ AdvSceneSwitcher.mediaTab.timeRestriction.shorter="播放时间小于" AdvSceneSwitcher.mediaTab.timeRestriction.longer="播放时间大于" AdvSceneSwitcher.mediaTab.timeRestriction.remainShorter="剩余时间少于" AdvSceneSwitcher.mediaTab.timeRestriction.remainLonger="剩余时间多于" -AdvSceneSwitcher.mediaTab.entry="当 {{meidaSources}} 状态为 {{states}} 并且 {{timeRestrictions}} {{time}} 时使用转场特效 {{transitions}} 切换到场景 {{scenes}}" +AdvSceneSwitcher.mediaTab.entry="当 {{mediaSources}} 状态为 {{states}} 并且 {{timeRestrictions}} {{time}} 时使用转场特效 {{transitions}} 切换到场景 {{scenes}}" ; File Tab AdvSceneSwitcher.fileTab.title="文件" diff --git a/src/switch-media.cpp b/src/switch-media.cpp index 5c1d7956..310d5c4c 100644 --- a/src/switch-media.cpp +++ b/src/switch-media.cpp @@ -444,7 +444,7 @@ void populateTimeRestrictions(QComboBox *list) MediaSwitchWidget::MediaSwitchWidget(MediaSwitch *s) : SwitchWidget(s) { - meidaSources = new QComboBox(); + mediaSources = new QComboBox(); states = new QComboBox(); timeRestrictions = new QComboBox(); time = new QSpinBox(); @@ -453,7 +453,7 @@ MediaSwitchWidget::MediaSwitchWidget(MediaSwitch *s) : SwitchWidget(s) time->setMaximum(99999999); time->setMinimum(0); - QWidget::connect(meidaSources, + QWidget::connect(mediaSources, SIGNAL(currentTextChanged(const QString &)), this, SLOT(SourceChanged(const QString &))); QWidget::connect(states, SIGNAL(currentIndexChanged(int)), this, @@ -463,12 +463,12 @@ MediaSwitchWidget::MediaSwitchWidget(MediaSwitch *s) : SwitchWidget(s) QWidget::connect(time, SIGNAL(valueChanged(int)), this, SLOT(TimeChanged(int))); - AdvSceneSwitcher::populateMediaSelection(meidaSources); + AdvSceneSwitcher::populateMediaSelection(mediaSources); populateMediaStates(states); populateTimeRestrictions(timeRestrictions); if (s) { - meidaSources->setCurrentText( + mediaSources->setCurrentText( GetWeakSourceName(s->source).c_str()); states->setCurrentIndex(s->state); timeRestrictions->setCurrentIndex(s->restriction); @@ -479,7 +479,7 @@ MediaSwitchWidget::MediaSwitchWidget(MediaSwitch *s) : SwitchWidget(s) QHBoxLayout *mainLayout = new QHBoxLayout; std::unordered_map widgetPlaceholders = { - {"{{meidaSources}}", meidaSources}, + {"{{mediaSources}}", mediaSources}, {"{{states}}", states}, {"{{timeRestrictions}}", timeRestrictions}, {"{{time}}", time},