From bfee0019b7700ac16ba335808d9f3327e2e05a43 Mon Sep 17 00:00:00 2001 From: Cameron Chamberlain Date: Sat, 26 Mar 2016 22:30:38 +1100 Subject: [PATCH] Fix: User facing typos throughout application MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - inbeteween -> inbetween - abount -> about - seleted -> selected - successfull -> successful - undefinied -> undefined - colonnesdoivent (fr) -> colonnes doivent - seleted (fr) -> sélectionnés - cleeanup -> removed from translations, wasn't translated anyway and was removed from english codebase --- toonz/sources/toonz/filmstripcommand.cpp | 10 +++++----- toonz/sources/toonz/inbetweencommand.cpp | 8 ++++---- toonz/sources/toonz/mainwindow.cpp | 2 +- toonz/sources/toonz/matchlinecommand.cpp | 2 +- toonz/sources/toonz/tasksviewer.cpp | 2 +- toonz/sources/toonz/trackerpopup.cpp | 2 +- toonz/sources/translations/french/toonz.ts | 14 +++++--------- toonz/sources/translations/italian/toonz.ts | 12 ++++-------- toonz/sources/translations/japanese/toonz.ts | 14 +++++--------- 9 files changed, 27 insertions(+), 39 deletions(-) diff --git a/toonz/sources/toonz/filmstripcommand.cpp b/toonz/sources/toonz/filmstripcommand.cpp index be2e71bc..40619647 100644 --- a/toonz/sources/toonz/filmstripcommand.cpp +++ b/toonz/sources/toonz/filmstripcommand.cpp @@ -2477,13 +2477,13 @@ void FilmstripCmd::moveToScene(TXshSoundLevel *sl) } //============================================================================= -// UndoInbeteween +// UndoInbetween //----------------------------------------------------------------------------- namespace { -class UndoInbeteween : public TUndo +class UndoInbetween : public TUndo { TXshSimpleLevelP m_level; vector m_fids; @@ -2491,7 +2491,7 @@ class UndoInbeteween : public TUndo FilmstripCmd::InbetweenInterpolation m_interpolation; public: - UndoInbeteween( + UndoInbetween( TXshSimpleLevel *xl, std::vector fids, FilmstripCmd::InbetweenInterpolation interpolation) @@ -2530,7 +2530,7 @@ public: QString getHistoryString() { - QString str = QObject::tr("Inbeteween : Level %1, ") + QString str = QObject::tr("Inbetween : Level %1, ") .arg(QString::fromStdWString(m_level->getName())); switch (m_interpolation) { case FilmstripCmd::II_Linear: @@ -2631,7 +2631,7 @@ void FilmstripCmd::inbetween(TXshSimpleLevel *sl, fids.push_back(*it); } - TUndoManager::manager()->add(new UndoInbeteween(sl, fids, interpolation)); + TUndoManager::manager()->add(new UndoInbetween(sl, fids, interpolation)); inbetweenWithoutUndo(sl, fid0, fid1, interpolation); TApp::instance()->getCurrentScene()->setDirtyFlag(true); diff --git a/toonz/sources/toonz/inbetweencommand.cpp b/toonz/sources/toonz/inbetweencommand.cpp index 538fa5f7..475817dc 100644 --- a/toonz/sources/toonz/inbetweencommand.cpp +++ b/toonz/sources/toonz/inbetweencommand.cpp @@ -124,13 +124,13 @@ TVectorImageP MyInbetweener::tween(double t) } //============================================================================= -// UndoInbeteween +// UndoInbetween //----------------------------------------------------------------------------- namespace { -class UndoInbeteween : public TUndo +class UndoInbetween : public TUndo { TXshSimpleLevelP m_level; vector m_fids; @@ -138,7 +138,7 @@ class UndoInbeteween : public TUndo FilmstripCmd::InbetweenInterpolation m_interpolation; public: - UndoInbeteween( + UndoInbetween( TXshSimpleLevel *xl, std::vector fids, FilmstripCmd::InbetweenInterpolation interpolation) @@ -252,7 +252,7 @@ void FilmstripCmd::inbetween(TXshSimpleLevel *sl, fids.push_back(*it); } - TUndoManager::manager()->add(new UndoInbeteween(sl, fids, interpolation)); + TUndoManager::manager()->add(new UndoInbetween(sl, fids, interpolation)); inbetweenWithoutUndo(sl, fid0, fid1, interpolation); TApp::instance()->getCurrentScene()->setDirtyFlag(true); diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index dbf8b722..45d42efc 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -1850,7 +1850,7 @@ void MainWindow::defineActions() createMenuWindowsAction(MI_ResetRoomLayout, tr("&Reset to Default Rooms"), ""); - createMenuWindowsAction(MI_About, tr("&Abount OpenToonz..."), ""); + createMenuWindowsAction(MI_About, tr("&About OpenToonz..."), ""); createRightClickMenuAction(MI_BlendColors, tr("&Blend colors"), ""); diff --git a/toonz/sources/toonz/matchlinecommand.cpp b/toonz/sources/toonz/matchlinecommand.cpp index dcaa591c..83d96f68 100644 --- a/toonz/sources/toonz/matchlinecommand.cpp +++ b/toonz/sources/toonz/matchlinecommand.cpp @@ -137,7 +137,7 @@ public: std::set indices = selection->getIndices(); if (indices.size() != 2) { - MsgBox(WARNING, tr("It is not possible to apply the match lines because two columns have to be seleted.")); + MsgBox(WARNING, tr("It is not possible to apply the match lines because two columns have to be selected.")); return; } diff --git a/toonz/sources/toonz/tasksviewer.cpp b/toonz/sources/toonz/tasksviewer.cpp index 034705cb..24a92746 100644 --- a/toonz/sources/toonz/tasksviewer.cpp +++ b/toonz/sources/toonz/tasksviewer.cpp @@ -907,7 +907,7 @@ TaskSheet::TaskSheet(TasksViewer *owner) //m_stepCount->setMaximumWidth(38); ::create(m_failedSteps, layout, tr("Failed Steps:"), row++); // m_failedSteps->setMaximumWidth(38); - ::create(m_succSteps, layout, tr("Successfull Steps:"), row++); + ::create(m_succSteps, layout, tr("Successful Steps:"), row++); // m_succSteps->setMaximumWidth(38); ::create(m_priority, layout, tr("Priority:"), row++); // m_priority->setMaximumWidth(40); diff --git a/toonz/sources/toonz/trackerpopup.cpp b/toonz/sources/toonz/trackerpopup.cpp index 3f026990..d046a81f 100644 --- a/toonz/sources/toonz/trackerpopup.cpp +++ b/toonz/sources/toonz/trackerpopup.cpp @@ -793,7 +793,7 @@ QString Tracker::getErrorMessage(int errorCode) errorMessage = QObject::tr("It is not possible to track specified regions:\nthe level has to be saved first."); break; default: - errorMessage = QObject::tr("It is not possible to track the level:\nundefinied error."); + errorMessage = QObject::tr("It is not possible to track the level:\nundefined error."); } return errorMessage; } diff --git a/toonz/sources/translations/french/toonz.ts b/toonz/sources/translations/french/toonz.ts index 8992e152..187dfda3 100644 --- a/toonz/sources/translations/french/toonz.ts +++ b/toonz/sources/translations/french/toonz.ts @@ -112,8 +112,8 @@ Il n'est pas possible d'appliquer les lignes de correspondance, car aucune colonne a été sélectionné. - It is not possible to apply the match lines because two columns have to be seleted. - Il n'est pas possible d'appliquer les lignes de match parce que les deux colonnesdoivent être seleted. + It is not possible to apply the match lines because two columns have to be selected. + Il n'est pas possible d'appliquer les lignes de match parce que les deux colonnes doivent être sélectionnés. @@ -5804,7 +5804,7 @@ le niveau doit être enregistré d'abord. It is not possible to track the level: -undefinied error. +undefined error. Il n'est pas possible de tracer le niveau: erreur indéfini. @@ -6634,7 +6634,7 @@ Are you sure to - Inbeteween : Level %1, + Inbetween : Level %1, @@ -6826,10 +6826,6 @@ Are you sure to Combo Viewer - - Cleeanup Settings - - Move Level to Cast Folder @@ -8425,7 +8421,7 @@ Cliquez sur le bouton fléché pour créer un nouveau sub-xsheet Pas Échoués: - Successfull Steps: + Successful Steps: Pas réussis: diff --git a/toonz/sources/translations/italian/toonz.ts b/toonz/sources/translations/italian/toonz.ts index f3116644..4e246d69 100644 --- a/toonz/sources/translations/italian/toonz.ts +++ b/toonz/sources/translations/italian/toonz.ts @@ -112,7 +112,7 @@ Impossibile applicare le match lines poichè non è stata selezionata nessuna colonna. - It is not possible to apply the match lines because two columns have to be seleted. + It is not possible to apply the match lines because two columns have to be selected. Impossibile applicare le match lines poichè devono essere selezionate due colonne. @@ -5805,7 +5805,7 @@ il livello deve essere prima salvato. It is not possible to track the level: -undefinied error. +undefined error. Non è possibile tracciare il livello: errore indefinito. @@ -6636,7 +6636,7 @@ Are you sure to - Inbeteween : Level %1, + Inbetween : Level %1, @@ -6828,10 +6828,6 @@ Are you sure to Combo Viewer - - Cleeanup Settings - - Move Level to Cast Folder @@ -8427,7 +8423,7 @@ Clicca la freccia per creare un nuovo sub-xsheet Passi Falliti: - Successfull Steps: + Successful Steps: Passi Portati a termine con Successo: diff --git a/toonz/sources/translations/japanese/toonz.ts b/toonz/sources/translations/japanese/toonz.ts index dd7ca075..4d9ef48c 100644 --- a/toonz/sources/translations/japanese/toonz.ts +++ b/toonz/sources/translations/japanese/toonz.ts @@ -113,7 +113,7 @@ 列が選択されていないので、マッチラインを合成できません。 - It is not possible to apply the match lines because two columns have to be seleted. + It is not possible to apply the match lines because two columns have to be selected. 二つの列が選択されていないので、マッチラインを合成できません。 @@ -4209,7 +4209,7 @@ Do you want to create it? 閉じる - &Abount OpenToonz... + &About OpenToonz... OpenToonzについて (&A)... @@ -5895,7 +5895,7 @@ the level has to be saved first. It is not possible to track the level: -undefinied error. +undefined error. レベルを追跡できません： 未定義のエラー。 @@ -6710,7 +6710,7 @@ Are you sure to レベルをシーンに移動 : レベル %1 - Inbeteween : Level %1, + Inbetween : Level %1, 中割り : レベル %1 @@ -6903,10 +6903,6 @@ Are you sure to Combo Viewer メインビューア - - Cleeanup Settings - トレース設定 - Move Level to Cast Folder レベルをシーンアセットに移動 @@ -8522,7 +8518,7 @@ Click the arrow button to create a new sub-xsheet 失敗ステップ数： - Successfull Steps: + Successful Steps: 成功ステップ数：