From 380c190ea10987c5a34880972b1948e242c73885 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 15 Aug 2026 16:41:06 -0300 Subject: Fix typos and grammar in user-visible messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- src/coff/base/text_coff.cpp | 2 +- src/common/gui/purl_gui.cpp | 2 +- src/devices/pic/prog/pic_prog.cpp | 2 +- src/libgui/project_wizard.cpp | 4 ++-- src/libgui/toplevel.cpp | 2 +- src/piklab-coff/main.cpp | 12 ++++++------ src/piklab-hex/main.cpp | 2 +- src/piklab-prog/cli_interactive.cpp | 2 +- src/piklab-prog/cmdline.cpp | 2 +- src/progs/icd2/base/icd2_prog.cpp | 2 +- src/progs/pickit2/base/pickit2_prog.cpp | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/coff/base/text_coff.cpp b/src/coff/base/text_coff.cpp index d8eba7b..948de14 100644 --- a/src/coff/base/text_coff.cpp +++ b/src/coff/base/text_coff.cpp @@ -242,7 +242,7 @@ const TQStringList &Coff::TextObject::filenames() const TQString Coff::TextObject::disassembly() const { init(); - if ( _list.isEmpty() ) return i18n("Parsing COFF file is not supported for this device or an error occured."); + if ( _list.isEmpty() ) return i18n("Parsing COFF file is not supported for this device or an error occurred."); return _list.join("\n"); } diff --git a/src/common/gui/purl_gui.cpp b/src/common/gui/purl_gui.cpp index 2908a10..cfc0fe5 100644 --- a/src/common/gui/purl_gui.cpp +++ b/src/common/gui/purl_gui.cpp @@ -40,7 +40,7 @@ PURL::Url PURL::getSaveUrl(const TQString &startDir, const TQString &filter, case NoSaveAction: break; case AskOverwrite: if ( url.exists() ) { - if ( !MessageBox::askContinue(i18n("File \"%1\" already exists. Overwrite ?").arg(url.pretty())) ) return Url(); + if ( !MessageBox::askContinue(i18n("File \"%1\" already exists. Overwrite?").arg(url.pretty())) ) return Url(); } break; case CancelIfExists: diff --git a/src/devices/pic/prog/pic_prog.cpp b/src/devices/pic/prog/pic_prog.cpp index b134303..366cd1c 100644 --- a/src/devices/pic/prog/pic_prog.cpp +++ b/src/devices/pic/prog/pic_prog.cpp @@ -439,7 +439,7 @@ bool Programmer::PicBase::eraseRange(Pic::MemoryRangeType type) bool Programmer::PicBase::internalEraseRange(Pic::MemoryRangeType type) { if ( !specific()->canEraseRange(type) && !specific()->canEraseAll() ) { - log(Log::LineType::SoftError, i18n("The selected programmer does not support erasing neither the specified range nor the whole device.")); + log(Log::LineType::SoftError, i18n("The selected programmer does not support erasing either the specified range or the whole device.")); return false; } if ( type==Pic::MemoryRangeType::Code && _hasProtectedCode ) { diff --git a/src/libgui/project_wizard.cpp b/src/libgui/project_wizard.cpp index 29870b0..c701218 100644 --- a/src/libgui/project_wizard.cpp +++ b/src/libgui/project_wizard.cpp @@ -178,13 +178,13 @@ void ProjectWizard::next() } Log::StringView sview; if ( !directory.exists() ) { - if ( !MessageBox::askContinue(i18n("Directory does not exists. Create it?")) ) return; + if ( !MessageBox::askContinue(i18n("Directory does not exist. Create it?")) ) return; if ( !_directory->directory().create(sview) ) { MessageBox::detailedSorry(i18n("Error creating directory."), sview.string(), Log::Show); return; } } else if ( url().exists() ) { - if ( !MessageBox::askContinue(i18n("Project \"%1\"already exists. Overwrite it?").arg(url().filename())) ) return; + if ( !MessageBox::askContinue(i18n("Project \"%1\" already exists. Overwrite it?").arg(url().filename())) ) return; } if ( !toolchain().check(device(), &Main::compileLog()) ) return; _files->setDirectory(_directory->directory()); diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp index 51d3ec9..33ae743 100644 --- a/src/libgui/toplevel.cpp +++ b/src/libgui/toplevel.cpp @@ -935,7 +935,7 @@ void MainWindow::program() HexEditor *editor = getHexEditor(); if ( editor==0 ) return; if ( Main::programmerGroup().isDebugger() && !Main::_projectManager->contains(editor->url()) ) { - MessageBox::sorry(i18n("It is not possible to start a debugging session with an hex file not generated with the current project."), Log::Show); + MessageBox::sorry(i18n("It is not possible to start a debugging session with a hex file not generated with the current project."), Log::Show); return; } Programmer::manager->program(*editor->memory(), Device::MemoryRange()); diff --git a/src/piklab-coff/main.cpp b/src/piklab-coff/main.cpp index fb50fe3..1cd0c59 100644 --- a/src/piklab-coff/main.cpp +++ b/src/piklab-coff/main.cpp @@ -22,12 +22,12 @@ const TDECmdLineOptions OPTIONS[] = { }; const CLI::CommandData CLI::NORMAL_COMMAND_DATA[] = { - { "info", NeedSource, I18N_NOOP("Return general informations.") }, - { "variables", NeedSource, I18N_NOOP("Return informations about variables (for object).") }, - { "symbols", NeedSource, I18N_NOOP("Return informations about symbols.") }, - { "sections", NeedSource, I18N_NOOP("Return informations about sections (for object).") }, - { "lines", NeedSource, I18N_NOOP("Return informations about code lines (for object).") }, - { "files", NeedSource, I18N_NOOP("Return informations about files.") }, + { "info", NeedSource, I18N_NOOP("Return general information.") }, + { "variables", NeedSource, I18N_NOOP("Return information about variables (for object).") }, + { "symbols", NeedSource, I18N_NOOP("Return information about symbols.") }, + { "sections", NeedSource, I18N_NOOP("Return information about sections (for object).") }, + { "lines", NeedSource, I18N_NOOP("Return information about code lines (for object).") }, + { "files", NeedSource, I18N_NOOP("Return information about files.") }, { 0, NoCommandProperty, 0 } }; const CLI::CommandData CLI::INTERACTIVE_COMMAND_DATA[] = { diff --git a/src/piklab-hex/main.cpp b/src/piklab-hex/main.cpp index c9665c1..12c8bc5 100644 --- a/src/piklab-hex/main.cpp +++ b/src/piklab-hex/main.cpp @@ -27,7 +27,7 @@ const CLI::CommandData CLI::NORMAL_COMMAND_DATA[] = { { "fix", NeedSource1 | NeedDestination, I18N_NOOP("Clean hex file and fix errors (wrong CRC, truncated line, truncated file).") }, { "compare", NeedSource1 | NeedSource2 | NeedCorrectInput, I18N_NOOP("Compare two hex files.") }, { "checksum", NeedSource1 | NeedCorrectInput | NeedDevice, I18N_NOOP("Return checksum.") }, - { "create", NeedDestination | NeedDevice, I18N_NOOP("Create an hex file for the specified device.") }, + { "create", NeedDestination | NeedDevice, I18N_NOOP("Create a hex file for the specified device.") }, { 0, NoCommandProperty, 0 } }; const CLI::CommandData CLI::INTERACTIVE_COMMAND_DATA[] = { diff --git a/src/piklab-prog/cli_interactive.cpp b/src/piklab-prog/cli_interactive.cpp index f8d8a52..d7c7309 100644 --- a/src/piklab-prog/cli_interactive.cpp +++ b/src/piklab-prog/cli_interactive.cpp @@ -213,7 +213,7 @@ CLI::ExitCode CLI::Interactive::processLine(const TQString &s) if ( data->properties & (InputHex|OutputHex) ) { if ( uint(words.count())>(hexi+1) ) return errorExit(i18n("Too many arguments."), ARG_ERROR); if ( uint(words.count())==(hexi+1) )_hexUrl = PURL::Url(runDirectory(), words[hexi]); - if ( _hexUrl.isEmpty() ) return errorExit(i18n("This command needs an hex filename."), ARG_ERROR); + if ( _hexUrl.isEmpty() ) return errorExit(i18n("This command needs a hex filename."), ARG_ERROR); } else if ( uint(words.count())>hexi ) return errorExit(i18n("Too many arguments."), ARG_ERROR); } else if ( words.count()!=1 ) return errorExit(i18n("This command takes no argument."), ARG_ERROR); diff --git a/src/piklab-prog/cmdline.cpp b/src/piklab-prog/cmdline.cpp index c71a595..1f4a4ed 100644 --- a/src/piklab-prog/cmdline.cpp +++ b/src/piklab-prog/cmdline.cpp @@ -334,7 +334,7 @@ CLI::ExitCode CLI::Main::checkProgrammer() Port::Description pd = static_cast(Programmer::manager)->portDescription(); bool ok = (config==0 || config->hardwareNames(pd.type).contains(_hardware)); delete config; - if ( !ok ) return errorExit(i18n("The selected programmer does not supported the specified hardware configuration (\"%1\").").arg(_hardware), NOT_SUPPORTED_ERROR); + if ( !ok ) return errorExit(i18n("The selected programmer does not support the specified hardware configuration (\"%1\").").arg(_hardware), NOT_SUPPORTED_ERROR); } return OK; } diff --git a/src/progs/icd2/base/icd2_prog.cpp b/src/progs/icd2/base/icd2_prog.cpp index 697561b..0609465 100644 --- a/src/progs/icd2/base/icd2_prog.cpp +++ b/src/progs/icd2/base/icd2_prog.cpp @@ -108,7 +108,7 @@ bool Icd2::ProgrammerBase::setupFirmware() log(Log::LineType::Error, i18n("Firmware still incorrect after uploading.")); return false; } - log(Log::LineType::Information, i18n(" Firmware succesfully uploaded.")); + log(Log::LineType::Information, i18n(" Firmware successfully uploaded.")); return true; } diff --git a/src/progs/pickit2/base/pickit2_prog.cpp b/src/progs/pickit2/base/pickit2_prog.cpp index 4349949..afcee7e 100644 --- a/src/progs/pickit2/base/pickit2_prog.cpp +++ b/src/progs/pickit2/base/pickit2_prog.cpp @@ -67,7 +67,7 @@ bool Pickit2::Base::doUploadFirmware(PURL::File &file) log(Log::LineType::Error, i18n("Failed to upload firmware.")); return false; } - log(Log::LineType::Information, i18n("Firmware succesfully uploaded.")); + log(Log::LineType::Information, i18n("Firmware successfully uploaded.")); return enterMode(::Programmer::NormalMode); } -- cgit v1.2.3