From 1414d5922e0c52b840a7efdceb6516db04363117 Mon Sep 17 00:00:00 2001 From: luz paz Date: Jan 11 2022 14:42:48 +0000 Subject: Fix various typos + translate some comments to EN Found via `codespell -q 3 -S *.ts,thirdparty,./toonz/sources/common/twain -L appy,ba,chunck,datas,forse,inbetween,inly,inout,pevent,possibile,strack,upto,vertexes` Follow-up to PR #4156 Closes #4072 Revert hidden unicode commit made by git client --- diff --git a/toonz/sources/common/tapptools/tcolorutils.cpp b/toonz/sources/common/tapptools/tcolorutils.cpp index bc0ac37..7395124 100644 --- a/toonz/sources/common/tapptools/tcolorutils.cpp +++ b/toonz/sources/common/tapptools/tcolorutils.cpp @@ -1040,7 +1040,7 @@ void TColorUtils::buildColorChipPalette(QList> &palette, QList colorChips; - // make rectangles by serching in the corner points + // make rectangles by searching in the corner points for (int ep0 = 0; ep0 < edgePoints.size(); ep0++) { QMap corners; diff --git a/toonz/sources/common/traster/traster.cpp b/toonz/sources/common/traster/traster.cpp index 480f148..718f432 100644 --- a/toonz/sources/common/traster/traster.cpp +++ b/toonz/sources/common/traster/traster.cpp @@ -65,7 +65,7 @@ m_buffer = BigMemoryManager.getMemoryChunk(lx*ly*pixelSize, this); //m_buffer = new UCHAR[lx*ly*pixelSize]; m_totalMemory += ((lx*ly*pixelSize)>>10); #ifdef _WIN32 -MessageBox( NULL, "Run out of contiguous phisical memory: please save all and +MessageBox( NULL, "Run out of contiguous physical memory: please save all and restart toonz!", "Warning", MB_OK); #endif }*/ diff --git a/toonz/sources/common/trop/tresample.cpp b/toonz/sources/common/trop/tresample.cpp index 830aa72..fd92cc7 100644 --- a/toonz/sources/common/trop/tresample.cpp +++ b/toonz/sources/common/trop/tresample.cpp @@ -3059,7 +3059,7 @@ void do_resample(TRasterCM32P rout, const TRasterCM32P &rin, v * wrapin; // Take the associated input pixel pointer tcm[0] = in_tcm[0]; if (u < lu - 1 && v < lv - 1) { - // Also take their 4 next neighbours (we shall perform a kinf of bilinear + // Also take their 4 next neighbours (we shall perform a kind of bilinear // interpolation) tcm[1] = in_tcm[1]; tcm[2] = in_tcm[wrapin]; diff --git a/toonz/sources/include/tcg/list.h b/toonz/sources/include/tcg/list.h index 3af056d..43ef89e 100644 --- a/toonz/sources/include/tcg/list.h +++ b/toonz/sources/include/tcg/list.h @@ -574,7 +574,7 @@ course, \par Features \li Insertion indexes are automatically generated keys with the same - access time of the undelying container (typically super-fast + access time of the underlying container (typically super-fast \p O(1)). \li Stable indexes and iterators with respect to every operation. diff --git a/toonz/sources/include/toonz/childstack.h b/toonz/sources/include/toonz/childstack.h index 5ab6ca9..6ce9145 100644 --- a/toonz/sources/include/toonz/childstack.h +++ b/toonz/sources/include/toonz/childstack.h @@ -97,7 +97,7 @@ Return a pointer to current xsheet. */ TXsheet *getXsheet() const { return m_xsheet; } - // NON USARE. Serve solo per un truccaccio sporchissimo in + // DO NOT USE. It's just for a very dirty make up in // xshcolumnselection.cpp void setXsheet(TXsheet *xsheet) { m_xsheet = xsheet; } diff --git a/toonz/sources/stdfx/igs_math_random.h b/toonz/sources/stdfx/igs_math_random.h index 94ee57d..d447771 100644 --- a/toonz/sources/stdfx/igs_math_random.h +++ b/toonz/sources/stdfx/igs_math_random.h @@ -8,7 +8,7 @@ 2001-04-25 update 2001-06-19 rename to 'calculator_random_plus_long.h' 2005-02-03 rename to 'ptbl_random.h' -2005-02-10 separete to 'ptbl_random.h' and 'ptbl_random.cxx' +2005-02-10 separate to 'ptbl_random.h' and 'ptbl_random.cxx' 解説 (2005-02-03.thu wrote) 疑似乱数整数列発生関数rand()は処理系定義であるため、 たとえば、radhat9とWindowsとでは疑似乱数列が違う。 diff --git a/toonz/sources/toonz/cellselection.cpp b/toonz/sources/toonz/cellselection.cpp index c55ba8b..1f648ab 100644 --- a/toonz/sources/toonz/cellselection.cpp +++ b/toonz/sources/toonz/cellselection.cpp @@ -3038,7 +3038,7 @@ void TCellSelection::overWritePasteCells() { TCellData *beforeData = new TCellData(); beforeData->setCells(xsh, r0, c0, r1, c1); - /*-- InsertをFalseにすることで、Ovewriteペーストになる + /*-- InsertをFalseにすることで、Overwriteペーストになる r1,c1はペースト範囲にあわせリサイズされる --*/ bool isPaste = pasteCellsWithoutUndo(r0, c0, r1, c1, false); diff --git a/toonz/sources/toonz/dvdirtreeview.cpp b/toonz/sources/toonz/dvdirtreeview.cpp index 7366a35..18ff154 100644 --- a/toonz/sources/toonz/dvdirtreeview.cpp +++ b/toonz/sources/toonz/dvdirtreeview.cpp @@ -1625,7 +1625,7 @@ void DvDirTreeView::getExpandedPathsRecursive(const QModelIndex &index, paths.append(path); } } - /*- serch child nodes if this node is expanded -*/ + /*- search child nodes if this node is expanded -*/ if (index != rootIndex() && !isExpanded(index)) return; int count = DvDirModel::instance()->rowCount(index); diff --git a/toonz/sources/toonz/exportxsheetpdf.cpp b/toonz/sources/toonz/exportxsheetpdf.cpp index 4b95abb..8f1e018 100644 --- a/toonz/sources/toonz/exportxsheetpdf.cpp +++ b/toonz/sources/toonz/exportxsheetpdf.cpp @@ -2579,7 +2579,7 @@ void ExportXsheetPdfPopup::onExport() { tr("The file %1 already exists.\nDo you want to overwrite it?") .arg(fp.getQString()); int ret = - DVGui::MsgBox(question, QObject::tr("Ovewrite"), QObject::tr("Cancel")); + DVGui::MsgBox(question, QObject::tr("Overwrite"), QObject::tr("Cancel")); if (ret == 0 || ret == 2) { return; } @@ -2649,7 +2649,7 @@ void ExportXsheetPdfPopup::onExportPNG() { tr("The file %1 already exists.\nDo you want to overwrite it?") .arg(fp.getQString()); int ret = - DVGui::MsgBox(question, QObject::tr("Ovewrite"), QObject::tr("Cancel")); + DVGui::MsgBox(question, QObject::tr("Overwrite"), QObject::tr("Cancel")); if (ret == 0 || ret == 2) { return; } diff --git a/toonz/sources/toonz/filebrowser.cpp b/toonz/sources/toonz/filebrowser.cpp index c583554..c4d1460 100644 --- a/toonz/sources/toonz/filebrowser.cpp +++ b/toonz/sources/toonz/filebrowser.cpp @@ -338,7 +338,7 @@ void FileBrowser::storeFolderHistory() { m_indexHistoryList << currentModelIndex; m_currentPosition++; } - // If the next hitory item is the same as the current one, just move to it + // If the next history item is the same as the current one, just move to it else if (m_indexHistoryList[m_currentPosition + 1] == currentModelIndex) { m_currentPosition++; } @@ -536,7 +536,7 @@ void FileBrowser::refreshCurrentFolderItems() { if (parentFp != TFilePath("") && parentFp != m_folder) m_items.push_back(Item(parentFp, true, false)); - // register the all folder items by using the folde tree model + // register all folder items by using the folder tree model DvDirModel *model = DvDirModel::instance(); QModelIndex currentIndex = model->getIndexByPath(m_folder); if (currentIndex.isValid()) { diff --git a/toonz/sources/toonz/iocommand.cpp b/toonz/sources/toonz/iocommand.cpp index 43a6550..e285611 100644 --- a/toonz/sources/toonz/iocommand.cpp +++ b/toonz/sources/toonz/iocommand.cpp @@ -3064,7 +3064,7 @@ public: int ret; if (sl && sl->getPath().getType() == "pli") { question = "Saving " + toQString(palettePath) + - "\nThis command will ovewrite the level data as well. Are " + "\nThis command will overwrite the level data as well. Are " "you sure ?"; ret = DVGui::MsgBox(question, QObject::tr("OK"), QObject::tr("Cancel"), 0); diff --git a/toonz/sources/toonz/xshcolumnviewer.cpp b/toonz/sources/toonz/xshcolumnviewer.cpp index 09d833b..1a09ff1 100644 --- a/toonz/sources/toonz/xshcolumnviewer.cpp +++ b/toonz/sources/toonz/xshcolumnviewer.cpp @@ -1122,7 +1122,7 @@ void ColumnArea::DrawHeader::drawThumbnail(QPixmap &iconPixmap) const { : PredefinedRect::THUMBNAIL) .translated(orig); - // pallete thumbnail + // palette thumbnail if (column->getPaletteColumn()) { p.drawPixmap(thumbnailImageRect, iconPixmap); return; diff --git a/toonz/sources/toonzlib/ikjacobian.cpp b/toonz/sources/toonzlib/ikjacobian.cpp index 091801c..cd311fe 100644 --- a/toonz/sources/toonzlib/ikjacobian.cpp +++ b/toonz/sources/toonzlib/ikjacobian.cpp @@ -269,7 +269,7 @@ MatrixRmn &MatrixRmn::AddToDiagonal(double d) // Adds d to each diagonal entry return *this; } -// Aggiunge i temini del vettore alla diagonale +// Adds the terms of the vector to the diagonal MatrixRmn &MatrixRmn::AddToDiagonal( const VectorRn &v) // Adds d to each diagonal entry { diff --git a/toonz/sources/toonzqt/flipconsole.cpp b/toonz/sources/toonzqt/flipconsole.cpp index 6b15593..f8bca51 100644 --- a/toonz/sources/toonzqt/flipconsole.cpp +++ b/toonz/sources/toonzqt/flipconsole.cpp @@ -177,7 +177,7 @@ void PlaybackExecutor::run() { 1000000000 / (qint64)abs(m_fps); // User-required time between frames qint64 emissionInstant = 0; // starting instant in which rendering is invoked - qint64 avgSwapTime = 0; // average time for swapping bufers + qint64 avgSwapTime = 0; // average time for swapping buffers qint64 shortTermDelayAdjuster = 0; // accumurate recent errors and adjust in short term @@ -203,7 +203,7 @@ void PlaybackExecutor::run() { avgSwapTime += avgSwapTimeD; avgSwapTime = std::min(targetFrameTime, std::max(avgSwapTime, (qint64)0)); - // preapre for the next sampling + // prepare for the next sampling lastFrameCounts[currSample] = playedFramesCount; lastSampleInstants[currSample] = emissionInstant; currSample = (currSample + 1) % 4;