ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-20 03:46:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some tr call messages to ease translation (#886)

Browse Source
This commit is contained in:
xarkes 2018-10-30 08:42:43 +01:00 committed by GitHub
parent e219b8daba
commit 1387ea40e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/AnalTask.cpp
View File

@ -23,7 +23,7 @@ void AnalTask::interrupt()
void AnalTask::runTask()
{
log(tr("Loading the file...\n"));
log(tr("Loading the file..."));
openFailed = false;
int perms = R_PERM_RX;
@ -64,7 +64,7 @@ void AnalTask::runTask()
}
if (!options.pdbFile.isNull()) {
log(tr("Loading PDB file...\n"));
log(tr("Loading PDB file..."));
Core()->loadPDB(options.pdbFile);
}
@ -73,7 +73,7 @@ void AnalTask::runTask()
}
if (!options.shellcode.isNull() && options.shellcode.size() / 2 > 0) {
log(tr("Loading shellcode...\n"));
log(tr("Loading shellcode..."));
Core()->cmd("wx " + options.shellcode);
}
@ -86,7 +86,7 @@ void AnalTask::runTask()
Core()->cmd("fs *");
if (!options.script.isNull()) {
log(tr("Executing script...\n"));
log(tr("Executing script..."));
Core()->loadScript(options.script);
}
@ -98,16 +98,16 @@ void AnalTask::runTask()
Core()->setConfig("prj.simple", true);
if (!options.analCmd.empty()) {
log(tr("Analyzing...\n"));
log(tr("Analyzing..."));
for (QString cmd : options.analCmd) {
if (isInterrupted()) {
return;
}
log(" " + tr("Running") + " " + cmd + "\n");
log(" " + tr("Running") + " " + cmd);
Core()->cmd(cmd);
}
log(tr("Analysis complete!\n"));
log(tr("Analysis complete!"));
} else {
log(tr("Skipping Analysis.\n"));
log(tr("Skipping Analysis."));
}
}

2
src/MainWindow.cpp
View File

@ -959,7 +959,7 @@ void MainWindow::on_actionExport_as_code_triggered()
void MainWindow::projectSaved(const QString &name)
{
core->message(tr("Project saved: ") + name);
core->message(tr("Project saved:") + " " + name);
}
void MainWindow::changeDebugView()

2
src/common/AsyncTask.cpp
View File

@ -60,7 +60,7 @@ void AsyncTask::run()
void AsyncTask::log(QString s)
{
logBuffer += s;
logBuffer += s + "\n";
emit logChanged(logBuffer);
}

36
src/dialogs/AboutDialog.cpp
View File

@ -23,30 +23,30 @@ AboutDialog::AboutDialog(QWidget *parent) :
setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint));
ui->logoSvgWidget->load(Config()->getLogoFile());
ui->label->setText(tr("<h1>Cutter</h1>"
"Version " CUTTER_VERSION_FULL "<br/>"
"Using r2-" R2_GITTAP
"<p><b>Optional Features:</b><br/>"
"Jupyter: %1<br/>"
"QtWebEngine: %2</p>"
"<h2>License</h2>"
"This Software is released under the GNU General Public License v3.0"
"<h2>Authors</h2>"
"xarkes, thestr4ng3r, ballessay<br/>"
"Based on work by Hugo Teso &lt;hugo.teso@gmail.org&gt; (originally Iaito).")
.arg(
QString aboutString("<h1>Cutter</h1>"
+ tr("Version") + " " CUTTER_VERSION_FULL "<br/>"
+ tr("Using r2-") + R2_GITTAP
+ "<p><b>" + tr("Optional Features:") + "</b><br/>"
+ QString("Jupyter: %1<br/>").arg(
#ifdef CUTTER_ENABLE_JUPYTER
"ON"
#else
"OFF"
#endif
,
)
+ QString("QtWebEngine: %2</p>").arg(
#ifdef CUTTER_ENABLE_QTWEBENGINE
"ON"
#else
"OFF"
#endif
));
)
+ "<h2>" + tr("License") + "</h2>"
+ tr("This Software is released under the GNU General Public License v3.0")
+ "<h2>" + tr("Authors") + "</h2>"
"xarkes, thestr4ng3r, ballessay<br/>"
"Based on work by Hugo Teso &lt;hugo.teso@gmail.org&gt; (originally Iaito).");
ui->label->setText(aboutString);
}
AboutDialog::~AboutDialog() {}
@ -129,10 +129,10 @@ void AboutDialog::serveVersionCheckReply(QNetworkReply *reply)
if (currVersion == CUTTER_VERSION_FULL) {
mb.setText(tr("You have latest version and no need to update!"));
} else {
mb.setText(tr("<b>Current version</b>: " CUTTER_VERSION_FULL "<br/>"
"<b>Latest version</b>: %1<br/><br/>"
"For update, please check the link: <a href=\"%2\">%2</a>")
.arg(currVersion, "https://github.com/radareorg/cutter/releases"));
mb.setText("<b>" + tr("Current version:") + "</b>" CUTTER_VERSION_FULL "<br/>"
+ "<b>" + tr("Latest version:") + "</b> " + currVersion + "<br/><br/>"
+ tr("For update, please check the link:")
+ "<a href=\"https://github.com/radareorg/cutter/releases\">%2</a>");
}
}
mb.exec();

3
src/widgets/VTablesWidget.cpp
View File

@ -59,7 +59,7 @@ QVariant VTableModel::data(const QModelIndex &index, int role) const
case Qt::DisplayRole:
switch (index.column()) {
case NAME:
return tr("VTable ") + QString::number(index.row() + 1);
return tr("VTable") + " " + QString::number(index.row() + 1);
case ADDRESS:
return RAddressString(vtables->at(index.row()).addr);
}
@ -86,6 +86,7 @@ QVariant VTableModel::headerData(int section, Qt::Orientation, int role) const
default:
break;
}
break;
default:
break;
}