diff --git a/locale/rvthtool_1337.ts b/locale/rvthtool_1337.ts
index e3a330b..a613ea9 100644
--- a/locale/rvthtool_1337.ts
+++ b/locale/rvthtool_1337.ts
@@ -29,52 +29,52 @@
v3r510n %1
-
+ Testers:73573r5:
-
+ UI Translators:u1 7r4n5l470r5:
-
+ Internal copy of %1.Using an internal copy of a library.1n73rn4l c0py 0f %1.
-
+ Compiled with %1.Compiled with a specific version of an external library.c0mp1l3d w17h %1.
-
+ Using %1.Using an external library, e.g. libpcre.sou51n6 %1.
-
+ License: %1License: (libraries with only a single license)l1c3n53: %1
-
+ Licenses: %1Licenses: (libraries with multiple licenses)l1c3n535: %1
-
+ For technical support, you can visit the following websites:f0r 73chn1c4l 5upp0r7, y0u c4n v1517 7h3 f0ll0w1n6 w3b51735:
-
+ You can also email the developer directly:y0u c4n 4l50 3m41l 7h3 d3v3l0p3r d1r3c7ly:
@@ -748,64 +748,48 @@ d3f4ul7 15 n0n3, wh1ch r3741n5 7h3 0r161n4l k3y.
r3cryp71n6 b4nk %1 70 %2: %L3 m1b / %L4 m1b c0p13d...
-
- doExtract() ERROR: rvth object is not set.
- d03x7r4c7() 3rr0r: rv7h 0bj3c7 15 n07 537.
-
-
-
- doExtract() ERROR: Bank number is not set.
- d03x7r4c7() 3rr0r: b4nk numb3r 15 n07 537.
+
+
+ %1() ERROR: rvth object is not set.
+ %1() 3rr0r: rv7h 0bj3c7 15 n07 537.
- doExtract() ERROR: Bank number %1 is out of range.
- d03x7r4c7() 3rr0r: b4nk numb3r %1 15 0u7 0f r4n63.
+
+ %1() ERROR: Bank number is not set.
+ %1() 3rr0r: b4nk numb3r 15 n07 537.
-
- doExtract() ERROR: gcmFilename is not set.
- d03x7r4c7() 3rr0r: 6cmf1l3n4m3 15 n07 537.
+
+
+ %1() ERROR: Bank number %2 is out of range.
+ %1() 3rr0r: b4nk numb3r %2 15 0u7 0f r4n63.
-
+
+
+ %1() ERROR: gcmFilename is not set.
+ %1() 3rr0r: 6cmf1l3n4m3 15 n07 537.
+
+
+ Bank %1 extracted into %2 successfully.b4nk %1 3x7r4c73d 1n70 %2 5ucc355fully.
-
- doExtract() ERROR extracting Bank %1 into %2: %3
- d03x7r4c7() 3rr0r 3x7r4c71n6 b4nk %1 1n70 %2: %3
+
+ ERROR extracting Bank %1 into %2: %3
+ 3rr0r 3x7r4c71n6 b4nk %1 1n70 %2: %3
-
- doImport() ERROR: rvth object is not set.
- d01mp0r7() 3rr0r: rv7h 0bj3c7 15 n07 537.
-
-
-
- doImport() ERROR: Bank number is not set.
- d01mp0r7() 3rr0r: b4nk numb3r 15 n07 537.
-
-
-
- doImport() ERROR: Bank number %1 is out of range.
- d01mp0r7() 3rr0r: b4nk numb3r %1 15 0u7 0f r4n63.
-
-
-
- doImport() ERROR: gcmFilename is not set.
- d01mp0r7() 3rr0r: 6cmf1l3n4m3 15 n07 537.
-
-
-
+ %1 imported into Bank %2 successfully.%1 1mp0r73d 1n70 b4nk %2 5ucc355fully.
-
- doImport() ERROR importing %1 into Bank %2: %3
- d01mp0r7() 3rr0r 1mp0r71n6 %1 1n70 b4nk %2: %3
+
+ ERROR importing %1 into Bank %2: %3
+ 3rr0r 1mp0r71n6 %1 1n70 b4nk %2: %3
diff --git a/locale/rvthtool_de.ts b/locale/rvthtool_de.ts
index ab3c0f5..39257ef 100644
--- a/locale/rvthtool_de.ts
+++ b/locale/rvthtool_de.ts
@@ -29,52 +29,52 @@
Version %1
-
+ Testers:Tester:
-
+ UI Translators:UI-Übersetzer:
-
+ Internal copy of %1.Using an internal copy of a library.Interne Kopie von %1.
-
+ Compiled with %1.Compiled with a specific version of an external library.Kompiliert mit %1.
-
+ Using %1.Using an external library, e.g. libpcre.soBenutze %1.
-
+ License: %1License: (libraries with only a single license)Lizenz: %1
-
+ Licenses: %1Licenses: (libraries with multiple licenses)Lizenzen: %1
-
+ For technical support, you can visit the following websites:Für technische Unterstützung können Sie die folgenden Websites besuchen:
-
+ You can also email the developer directly:Sie können sich auch direkt an den Entwickler wenden:
@@ -747,64 +747,48 @@ Standard ist keine, der den Originalschlüssel beibehält.
Bank %1 zu %2 wird neu verschlüsselt: %L3 MiB / %L4 MiB kopiert...
-
- doExtract() ERROR: rvth object is not set.
- doExtract() FEHLER: rvth Objekt ist nicht gesetzt.
-
-
-
- doExtract() ERROR: Bank number is not set.
- doExtract() FEHLER: Die Banknummer ist nicht gesetzt.
+
+
+ %1() ERROR: rvth object is not set.
+ %1() FEHLER: rvth Objekt ist nicht gesetzt.
- doExtract() ERROR: Bank number %1 is out of range.
- doExtract() FEHLER: Bank Nummer %1 ist außerhalb des Bereichs.
+
+ %1() ERROR: Bank number is not set.
+ %1() FEHLER: Die Banknummer ist nicht gesetzt.
-
- doExtract() ERROR: gcmFilename is not set.
- doExtract() FEHLER: gcmFilename ist nicht gesetzt.
+
+
+ %1() ERROR: Bank number %2 is out of range.
+ %1() FEHLER: Bank Nummer %2 ist außerhalb des Bereichs.
-
+
+
+ %1() ERROR: gcmFilename is not set.
+ %1() FEHLER: gcmFilename ist nicht gesetzt.
+
+
+ Bank %1 extracted into %2 successfully.Bank %1 erfolgreich in %2 extrahiert.
-
- doExtract() ERROR extracting Bank %1 into %2: %3
- doExtract() FEHLER extrahiere Bank %1 in %2: %3
+
+ ERROR extracting Bank %1 into %2: %3
+ FEHLER extrahiere Bank %1 in %2: %3
-
- doImport() ERROR: rvth object is not set.
- doImport() FEHLER: rvth Objekt ist nicht gesetzt.
-
-
-
- doImport() ERROR: Bank number is not set.
- doImport() FEHLER: Die Banknummer ist nicht gesetzt.
-
-
-
- doImport() ERROR: Bank number %1 is out of range.
- doImport() FEHLER: Bank Nummer %1 ist außerhalb des Bereichs.
-
-
-
- doImport() ERROR: gcmFilename is not set.
- doImport() FEHLER: gcmFilename ist nicht gesetzt.
-
-
-
+ %1 imported into Bank %2 successfully.%1 erfolgreich in Bank %2 importiert.
-
- doImport() ERROR importing %1 into Bank %2: %3
- doImport() FEHLER beim Importieren von %1 in Bank %2: %3
+
+ ERROR importing %1 into Bank %2: %3
+ FEHLER beim Importieren von %1 in Bank %2: %3
diff --git a/locale/rvthtool_en.ts b/locale/rvthtool_en.ts
index 0c7d91b..1133427 100644
--- a/locale/rvthtool_en.ts
+++ b/locale/rvthtool_en.ts
@@ -29,52 +29,52 @@
-
+ Testers:
-
+ UI Translators:
-
+ Internal copy of %1.Using an internal copy of a library.
-
+ Compiled with %1.Compiled with a specific version of an external library.
-
+ Using %1.Using an external library, e.g. libpcre.so
-
+ License: %1License: (libraries with only a single license)
-
+ Licenses: %1Licenses: (libraries with multiple licenses)
-
+ For technical support, you can visit the following websites:
-
+ You can also email the developer directly:
@@ -746,63 +746,47 @@ Default is None, which retains the original key.
-
- doExtract() ERROR: rvth object is not set.
-
-
-
-
- doExtract() ERROR: Bank number is not set.
+
+
+ %1() ERROR: rvth object is not set.
- doExtract() ERROR: Bank number %1 is out of range.
+
+ %1() ERROR: Bank number is not set.
-
- doExtract() ERROR: gcmFilename is not set.
+
+
+ %1() ERROR: Bank number %2 is out of range.
-
+
+
+ %1() ERROR: gcmFilename is not set.
+
+
+
+ Bank %1 extracted into %2 successfully.
-
- doExtract() ERROR extracting Bank %1 into %2: %3
-
-
-
-
- doImport() ERROR: rvth object is not set.
-
-
-
-
- doImport() ERROR: Bank number is not set.
-
-
-
-
- doImport() ERROR: Bank number %1 is out of range.
-
-
-
-
- doImport() ERROR: gcmFilename is not set.
-
-
-
-
- %1 imported into Bank %2 successfully.
+
+ ERROR extracting Bank %1 into %2: %3
- doImport() ERROR importing %1 into Bank %2: %3
+ %1 imported into Bank %2 successfully.
+
+
+
+
+ ERROR importing %1 into Bank %2: %3
diff --git a/locale/rvthtool_es.ts b/locale/rvthtool_es.ts
index c76e74c..b97d0d6 100644
--- a/locale/rvthtool_es.ts
+++ b/locale/rvthtool_es.ts
@@ -29,52 +29,52 @@
-
+ Testers:
-
+ UI Translators:
-
+ Internal copy of %1.Using an internal copy of a library.
-
+ Compiled with %1.Compiled with a specific version of an external library.
-
+ Using %1.Using an external library, e.g. libpcre.so
-
+ License: %1License: (libraries with only a single license)
-
+ Licenses: %1Licenses: (libraries with multiple licenses)
-
+ For technical support, you can visit the following websites:
-
+ You can also email the developer directly:
@@ -746,63 +746,47 @@ Default is None, which retains the original key.
-
- doExtract() ERROR: rvth object is not set.
-
-
-
-
- doExtract() ERROR: Bank number is not set.
+
+
+ %1() ERROR: rvth object is not set.
- doExtract() ERROR: Bank number %1 is out of range.
+
+ %1() ERROR: Bank number is not set.
-
- doExtract() ERROR: gcmFilename is not set.
+
+
+ %1() ERROR: Bank number %2 is out of range.
-
+
+
+ %1() ERROR: gcmFilename is not set.
+
+
+
+ Bank %1 extracted into %2 successfully.
-
- doExtract() ERROR extracting Bank %1 into %2: %3
-
-
-
-
- doImport() ERROR: rvth object is not set.
-
-
-
-
- doImport() ERROR: Bank number is not set.
-
-
-
-
- doImport() ERROR: Bank number %1 is out of range.
-
-
-
-
- doImport() ERROR: gcmFilename is not set.
-
-
-
-
- %1 imported into Bank %2 successfully.
+
+ ERROR extracting Bank %1 into %2: %3
- doImport() ERROR importing %1 into Bank %2: %3
+ %1 imported into Bank %2 successfully.
+
+
+
+
+ ERROR importing %1 into Bank %2: %3
diff --git a/src/qrvthtool/WorkerObject.cpp b/src/qrvthtool/WorkerObject.cpp
index 94d54eb..a624c2a 100644
--- a/src/qrvthtool/WorkerObject.cpp
+++ b/src/qrvthtool/WorkerObject.cpp
@@ -270,20 +270,22 @@ void WorkerObject::cancel(void)
void WorkerObject::doExtract(void)
{
// NOTE: Callback is set to use the private class.
+ const QString fn(QLatin1String("doImport"));
+
Q_D(WorkerObject);
if (!d->rvth) {
- emit finished(tr("doExtract() ERROR: rvth object is not set."), -EINVAL);
+ emit finished(tr("%1() ERROR: rvth object is not set.").arg(fn), -EINVAL);
return;
} else if (d->bank >= d->rvth->bankCount()) {
if (d->bank == ~0U) {
- emit finished(tr("doExtract() ERROR: Bank number is not set."), -EINVAL);
+ emit finished(tr("%1() ERROR: Bank number is not set.").arg(fn), -EINVAL);
} else {
- emit finished(tr("doExtract() ERROR: Bank number %1 is out of range.")
- .arg(d->bank+1), -ERANGE);
+ emit finished(tr("%1() ERROR: Bank number %2 is out of range.")
+ .arg(fn).arg(d->bank+1), -ERANGE);
}
return;
} else if (d->gcmFilename.isEmpty()) {
- emit finished(tr("doExtract() ERROR: gcmFilename is not set."), -EINVAL);
+ emit finished(tr("%1() ERROR: gcmFilename is not set.").arg(fn), -EINVAL);
return;
}
@@ -304,7 +306,7 @@ void WorkerObject::doExtract(void)
.arg(d->bank+1).arg(d->gcmFilenameOnly), ret);
} else {
// An error occurred...
- emit finished(tr("doExtract() ERROR extracting Bank %1 into %2: %3")
+ emit finished(tr("ERROR extracting Bank %1 into %2: %3")
.arg(d->bank+1).arg(d->gcmFilenameOnly).arg(ret), ret);
}
}
@@ -320,20 +322,22 @@ void WorkerObject::doExtract(void)
void WorkerObject::doImport(void)
{
// NOTE: Callback is set to use the private class.
+ const QString fn(QLatin1String("doImport"));
+
Q_D(WorkerObject);
if (!d->rvth) {
- emit finished(tr("doImport() ERROR: rvth object is not set."), -EINVAL);
+ emit finished(tr("%1() ERROR: rvth object is not set.").arg(fn), -EINVAL);
return;
} else if (d->bank >= d->rvth->bankCount()) {
if (d->bank == ~0U) {
- emit finished(tr("doImport() ERROR: Bank number is not set."), -EINVAL);
+ emit finished(tr("%1() ERROR: Bank number is not set.").arg(fn), -EINVAL);
} else {
- emit finished(tr("doImport() ERROR: Bank number %1 is out of range.")
- .arg(d->bank+1), -ERANGE);
+ emit finished(tr("%1() ERROR: Bank number %2 is out of range.")
+ .arg(fn).arg(d->bank+1), -ERANGE);
}
return;
} else if (d->gcmFilename.isEmpty()) {
- emit finished(tr("doImport() ERROR: gcmFilename is not set."), -EINVAL);
+ emit finished(tr("%1() ERROR: gcmFilename is not set.").arg(fn), -EINVAL);
return;
}
@@ -354,7 +358,7 @@ void WorkerObject::doImport(void)
.arg(d->gcmFilenameOnly).arg(d->bank+1), ret);
} else {
// An error occurred...
- emit finished(tr("doImport() ERROR importing %1 into Bank %2: %3")
+ emit finished(tr("ERROR importing %1 into Bank %2: %3")
.arg(d->gcmFilenameOnly).arg(d->bank+1).arg(ret), ret);
}
}