From 7db72b636a23228a45746af215d67e2c3bb22550 Mon Sep 17 00:00:00 2001 From: artisteacher Date: Mar 10 2019 21:41:13 +0000 Subject: Replace RGBM and fix typos (#2551) * Remove extra t from contain * Fix error message to use rgba * Fix label to use RGBA * Clarify send back menu item --- diff --git a/stuff/profiles/layouts/fxs/STD_rgbmCutFx.xml b/stuff/profiles/layouts/fxs/STD_rgbmCutFx.xml index da3f2ca..ef8a9c4 100644 --- a/stuff/profiles/layouts/fxs/STD_rgbmCutFx.xml +++ b/stuff/profiles/layouts/fxs/STD_rgbmCutFx.xml @@ -1,5 +1,5 @@ - + r_range g_range b_range diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index 289f81a..fb510ad 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -1610,7 +1610,7 @@ void MainWindow::defineActions() { createMenuEditAction(MI_Ungroup, tr("&Ungroup"), "Ctrl+Shift+G"); createMenuEditAction(MI_BringToFront, tr("&Bring to Front"), "Ctrl+]"); createMenuEditAction(MI_BringForward, tr("&Bring Forward"), "]"); - createMenuEditAction(MI_SendBack, tr("&Send Back"), "Ctrl+["); + createMenuEditAction(MI_SendBack, tr("&Send to Back"), "Ctrl+["); createMenuEditAction(MI_SendBackward, tr("&Send Backward"), "["); createMenuEditAction(MI_EnterGroup, tr("&Enter Group"), ""); createMenuEditAction(MI_ExitGroup, tr("&Exit Group"), ""); diff --git a/toonz/sources/toonzlib/txshsimplelevel.cpp b/toonz/sources/toonzlib/txshsimplelevel.cpp index b22ae35..21fdbae 100644 --- a/toonz/sources/toonzlib/txshsimplelevel.cpp +++ b/toonz/sources/toonzlib/txshsimplelevel.cpp @@ -1138,7 +1138,7 @@ void TXshSimpleLevel::load() { if (info && info->m_samplePerPixel >= 5) { QString msg = QString( "Failed to open %1.\nSamples per pixel is more than " - "4. It may containt more than one alpha channel.") + "4. It may contain more than one alpha channel.") .arg(QString::fromStdWString(m_path.getWideString())); QMessageBox::warning(0, "Image format not supported", msg); return; diff --git a/toonz/sources/toonzqt/imageutils.cpp b/toonz/sources/toonzqt/imageutils.cpp index 4fb2c16..21e7889 100644 --- a/toonz/sources/toonzqt/imageutils.cpp +++ b/toonz/sources/toonzqt/imageutils.cpp @@ -215,7 +215,7 @@ void premultiply(const TFilePath &levelPath) { /* if (!isMovie && lr->getImageInfo()->m_samplePerPixel!=4) { -QMessageBox::information(0, QString("ERROR"), QString("Only rgbm images can be +QMessageBox::information(0, QString("ERROR"), QString("Only rgba images can be premultiplied!")); return; }