Commit 40df25b9 authored by Yuri Chornoivan's avatar Yuri Chornoivan Committed by Jean-Baptiste Mardelle

Fix some EBN issues (typos)

Conflicts:
	src/jogshuttle/jogshuttle.cpp
	src/mainwindow.cpp
	src/timeline/trackview.cpp
parent d8ba89ae
......@@ -111,7 +111,7 @@ Comment[x-test]=xxNonlinear video editor for KDExx
Comment[zh_CN]=KDE 的非线性视频编辑器
Comment[zh_TW]=KDE 上的非線性影像編輯器
Type=Application
Exec=kdenlive %i -caption %c %u
Exec=kdenlive %U
Icon=kdenlive
X-DocPath=kdenlive/index.html
X-DocPath[cs]=http://cs.wikibooks.org/wiki/Kdenlive
......
......@@ -51,7 +51,7 @@ public:
are neutral colors. The colors on the y axis show what the neutral color will look like when modifying the curve.
color defines the color to modify on the y axis. The other two components will be increased
in equal terms (linear as well) on the x axis.
scaling \in ]0,1] defines the maximum variance of the selected component; Chosing a value lower than 1
scaling \in ]0,1] defines the maximum variance of the selected component; Choosing a value lower than 1
simulates the case that the curves can adjust only +- scaling*255. This mainly delivers a more constant look
when also using the Luma component for the curves display but might not represent the actual color change!
*/
......
......@@ -224,7 +224,7 @@ private: // Private attributes
/** a unique numeric id */
QString m_id;
/** Wheter the clip is a placeholder (clip missing but user wants to see it) */
/** Whether the clip is a placeholder (clip missing but user wants to see it) */
bool m_placeHolder;
QList <CutZoneInfo> m_cutZones;
......
......@@ -152,7 +152,7 @@ bool DocumentValidator::validate(const double currentVersion)
tracksMax = qMax(tracks.count() - 1, tracksMax);
QDomNodeList tracksinfo = kdenliveDoc.elementsByTagName("trackinfo");
tracksMax = qMax(tracksinfo.count(), tracksMax);
tracksMax = qMax(1, tracksMax); // Force existance of one track
tracksMax = qMax(1, tracksMax); // Force existence of one track
if (playlists.count() - 1 < tracksMax ||
tracks.count() - 1 < tracksMax ||
tracksinfo.count() < tracksMax) {
......
......@@ -47,7 +47,7 @@ public:
QDomElement getEffectByName(const QString & name) const;
QDomElement getEffectByTag(const QString & tag, const QString & id) const;
/** @brief Checks the existance of an effect.
/** @brief Checks the existence of an effect.
* @param tag effect tag
* @param id effect id
* @return effect index if the effect exists, -1 otherwise */
......
......@@ -65,7 +65,7 @@ signals:
};
/**
* @brief A widget for modifing numbers by dragging, using the mouse wheel or entering them with the keyboard.
* @brief A widget for modifying numbers by dragging, using the mouse wheel or entering them with the keyboard.
*/
class DragValue : public QWidget
......
......@@ -205,7 +205,7 @@ private slots:
/** @brief Update check all button status */
void slotUpdateCheckAllButton();
/** @brief Display additionnal effect info */
/** @brief Display additional effect info */
void slotShowComments();
/** @brief An effect group was renamed, update effects info */
......
......@@ -46,19 +46,19 @@ public:
void setMode(CurveModes mode);
private slots:
/** @brief Sets the spinboxes for modifing the selected point to @param p. */
/** @brief Sets the spinboxes for modifying the selected point to @param p. */
void slotUpdatePointEntries(const BPoint &p);
/** @brief Updates the spline if the current point's p was modified using the spinboxes.
* @param value (optional) not used, neccessary to be able to connect to DragValue's valueChanged.
* @param value (optional) not used, necessary to be able to connect to DragValue's valueChanged.
* @param final (default = true) emit signal modified? */
void slotUpdatePointP(double value = 1, bool final = true);
/** @brief Updates the spline if the current point's h1 was modified using the spinboxes.
* @param value (optional) not used, neccessary to be able to connect to DragValue's valueChanged.
* @param value (optional) not used, necessary to be able to connect to DragValue's valueChanged.
* @param final (default = true) emit signal modified? */
void slotUpdatePointH1(double value = 1, bool final = true);
/** @brief Updates the spline if the current point's h2 was modified using the spinboxes.
* @param value (optional) not used, neccessary to be able to connect to DragValue's valueChanged.
* @param value (optional) not used, necessary to be able to connect to DragValue's valueChanged.
* @param final (default = true) emit signal modified? */
void slotUpdatePointH2(double value = 1, bool final = true);
......
......@@ -41,7 +41,7 @@ public:
* @param alphaEnabled (optional) Should transparent colors be enabled */
explicit ChooseColorWidget(const QString &text = QString(), const QString &color = "0xffffffff", bool alphaEnabled = false, QWidget* parent = 0);
/** @brief Gets the choosen color. */
/** @brief Gets the chosen color. */
QString getColor() const;
private:
......@@ -52,7 +52,7 @@ private slots:
void setColor(const QColor &color);
signals:
/** @brief Emitted whenever a different color was choosen. */
/** @brief Emitted whenever a different color was chosen. */
void modified();
void displayMessage(const QString&, int);
/** @brief When user wants to pick a color, it's better to disable filter so we get proper color values. */
......
......@@ -378,7 +378,7 @@ void KisCurveWidget::mouseMoveEvent(QMouseEvent * e)
double x = e->pos().x() / (double)(width() - 1);
double y = 1.0 - e->pos().y() / (double)(height() - 1);
if (d->state() == ST_NORMAL) { // If no point is selected set the the cursor shape if on top
if (d->state() == ST_NORMAL) { // If no point is selected set the cursor shape if on top
int nearestPointIndex = d->nearestPointInRange(QPointF(x, y), width(), height());
if (nearestPointIndex < 0)
......
......@@ -94,7 +94,7 @@ void ShuttleThread::run()
// see if there was an error or timeout else process event
if (result < 0 && errno == EINTR) {
// EINTR event catched. This is not a problem - continue processing
// EINTR event caught. This is not a problem - continue processing
//qDebug() << strerror(errno) << '\n';
// continue processing
continue;
......
......@@ -581,7 +581,7 @@ void RecMonitor::slotStartPreview(bool play)
void RecMonitor::slotRecord()
{
m_error.clear();
video_frame->setText("");// clear error text from previous run if any.
video_frame->clear();// clear error text from previous run if any.
// ^^ This does clear the error text but the change is not visible straight way in the UI
// it only becomes visible after the capture is complete. Vincent and JBM - how come? What can
// we do to make the error text go way as soon as a new capture starts. It is missleading to the user
......
......@@ -175,7 +175,7 @@ void RotoWidget::slotPositionChanged(int pos, bool seek)
QList <BPoint> p2 = getPoints(keyframe2);
qreal relPos = (pos - keyframe1) / (qreal)(keyframe2 - keyframe1 + 1);
// additionaly points are ignored (same behavior as MLT filter)
// additionally points are ignored (same behavior as MLT filter)
int count = qMin(p1.count(), p2.count());
for (int i = 0; i < count; ++i) {
BPoint bp;
......
......@@ -210,7 +210,7 @@ void ClipPropertiesManager::slotApplyNewClipProperties(const QString& id, const
pCore->projectManager()->current()->setModified();
if (refresh) {
// update clip occurences in timeline
// update clip occurrences in timeline
pCore->projectManager()->currentTrackView()->projectView()->slotUpdateClip(id, reload);
}
}
......
......@@ -76,7 +76,7 @@ void StatusBarMessageLabel::setMessage(const QString& text,
if (item.type == ErrorMessage || item.type == MltError || item.type == ProcessingJobMessage) {
qDebug() << item.text;
// Put the new errror message at first place and immediately show it
// Put the new error message at first place and immediately show it
if (item.timeoutMillis < 2000) {
item.timeoutMillis = 2000;
}
......
......@@ -108,7 +108,7 @@ protected:
GenTime m_startPos;*/
GenTime m_maxDuration;
QMap <int, int> m_keyframes;
/** @brief Strech factor so that keyframes display on the full clip height. */
/** @brief Stretch factor so that keyframes display on the full clip height. */
double m_keyframeFactor;
/** @brief Offset factor so that keyframes minimum value are displaed at the bottom of the clip. */
double m_keyframeOffset;
......
......@@ -72,7 +72,7 @@ protected:
private:
QPainterPath groupShape(GraphicsRectItem type, const QPointF &offset) const;
QPainterPath spacerGroupShape(GraphicsRectItem type, const QPointF &offset) const;
/** Stores the original info of the items beeing resized. */
/** Stores the original info of the items being resized. */
QList <ItemInfo> m_resizeInfos;
};
......
......@@ -67,7 +67,7 @@ ClipItem::ClipItem(DocClipBase *clip, const ItemInfo& info, double fps, double s
setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (double) itemHeight());
setPos(info.startPos.frames(fps), (double)(info.track * KdenliveSettings::trackheight()) + 1 + itemOffset());
// set speed independant info
// set speed independent info
if (m_speed <= 0 && m_speed > -1)
m_speed = -1.0;
m_speedIndependantInfo = m_info;
......@@ -1321,7 +1321,7 @@ void ClipItem::resizeStart(int posx, bool /*size*/, bool emitChange)
const int previous = cropStart().frames(m_fps);
AbstractClipItem::resizeStart(posx, sizeLimit);
// set speed independant info
// set speed independent info
m_speedIndependantInfo = m_info;
m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * qAbs(m_speed)), m_fps);
m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * qAbs(m_speed)), m_fps);
......@@ -1348,7 +1348,7 @@ void ClipItem::resizeEnd(int posx, bool emitChange)
const int previous = cropDuration().frames(m_fps);
AbstractClipItem::resizeEnd(posx);
// set speed independant info
// set speed independent info
m_speedIndependantInfo = m_info;
m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * qAbs(m_speed)), m_fps);
m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * qAbs(m_speed)), m_fps);
......
......@@ -4211,7 +4211,7 @@ void CustomTrackView::deleteClip(ItemInfo info, bool refresh)
item->closeAnimation();
/*if (refresh) item->closeAnimation();
else {
// no refresh, means we have several operations chained, we need to delete clip immediatly
// no refresh, means we have several operations chained, we need to delete clip immediately
// so that it does not get in the way of the other
delete item;
item = NULL;
......
......@@ -152,7 +152,7 @@ public:
/// Automatically align the currently selected clips to synchronize their audio with the reference's audio
void alignAudio();
/** @brief Seperates the audio of a clip to a audio track.
/** @brief Separates the audio of a clip to a audio track.
* @param pos Position of the clip to split
* @param track Track of the clip
* @param split Split or unsplit */
......@@ -167,7 +167,7 @@ public:
int selectedTrack() const;
QStringList selectedClips() const;
QList<ClipItem *> selectedClipItems() const;
/** @brief Checks wheter an item can be inserted (make sure it does not overlap another item) */
/** @brief Checks whether an item can be inserted (make sure it does not overlap another item) */
bool canBePastedTo(ItemInfo info, int type) const;
/** @brief Selects a clip.
......
......@@ -1166,7 +1166,7 @@ void TrackView::slotUpdateTrackEffectState(int ix)
{
QList<HeaderTrack *> widgets = findChildren<HeaderTrack *>();
if (ix < 0 || ix >= widgets.count()) {
//qDebug() << "ERROR, Trying to access a non existant track: " << ix;
//qDebug() << "ERROR, Trying to access a non existent track: " << ix;
return;
}
widgets.at(m_doc->tracksCount() - ix - 1)->updateEffectLabel(m_doc->trackInfoAt(ix).effectsList.effectNames());
......
......@@ -62,7 +62,7 @@ public:
~AbstractService();
/** @brief Get file extension for currently selected item. */
virtual QString getExtension(QListWidgetItem *item);
/** @brief Get recommanded download file name. */
/** @brief Get recommEnded download file name. */
virtual QString getDefaultDownloadName(QListWidgetItem *item);
/** @brief Does this service provide a preview (for example preview a sound. */
bool hasPreview;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment