[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeutils/ark
From: Raphael Kubo da Costa <kubito () gmail ! com>
Date: 2010-10-18 0:18:48
Message-ID: 20101018001848.D9840AC898 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1186944 by rkcosta:
Use the <filename> and <message> semantic tags instead of '' or <b>.
M +2 -2 kerfuffle/cliinterface.cpp
M +4 -4 kerfuffle/extractiondialog.cpp
M +1 -1 kerfuffle/queries.cpp
M +6 -6 plugins/karchiveplugin/karchiveplugin.cpp
M +8 -8 plugins/libarchive/libarchivehandler.cpp
--- trunk/KDE/kdeutils/ark/kerfuffle/cliinterface.cpp #1186943:1186944
@@ -529,12 +529,12 @@
m_program = KStandardDirs::findExe(program);
if (m_program.isEmpty()) {
- error(i18n("Failed to locate program '%1' in PATH.", program));
+ error(i18n("Failed to locate program <filename>%1</filename> in PATH.", \
program)); return false;
}
if (!createProcess()) {
- error(i18n("Found program '%1', but failed to initialize the process.", \
program)); + error(i18n("Found program <filename>%1</filename>, but failed to \
initialize the process.", program)); return false;
}
--- trunk/KDE/kdeutils/ark/kerfuffle/extractiondialog.cpp #1186943:1186944
@@ -105,7 +105,7 @@
if (KIO::NetAccess::exists(pathWithSubfolder, KIO::NetAccess::SourceSide, \
0)) { if (QFileInfo(pathWithSubfolder).isDir()) {
- int overwrite = KMessageBox::questionYesNo(0, i18n("The folder '%1' \
already exists. Are you sure you want to extract here?", pathWithSubfolder), \
i18n("Folder exists"), KGuiItem(i18n("Extract here")), KGuiItem(i18n("Cancel"))); + \
int overwrite = KMessageBox::questionYesNo(0, i18n("The folder \
<filename>%1</filename> already exists. Are you sure you want to extract here?", \
pathWithSubfolder), i18n("Folder exists"), KGuiItem(i18n("Extract here")), \
KGuiItem(i18n("Cancel")));
if (overwrite == KMessageBox::No) {
//TODO: choosing retry should also be possible, so one does
@@ -114,13 +114,13 @@
}
} else {
KMessageBox::detailedError(0,
- i18n("The folder <b>%1</b> could not be \
created.", subfolder()),
- i18n("<b>%1</b> already exists, but is \
not a folder.", subfolder())); + i18n("The \
folder <filename>%1</filename> could not be created.", subfolder()), + \
i18n("<filename>%1</filename> already exists, but is not a folder.", subfolder())); \
return; }
} else if (!KIO::NetAccess::mkdir(pathWithSubfolder, 0)) {
KMessageBox::detailedError(0,
- i18n("The folder <b>%1</b> could not be \
created.", subfolder()), + i18n("The folder \
<filename>%1</filename> could not be created.", subfolder()),
i18n("Please check your permissions to create \
it.")); return;
}
--- trunk/KDE/kdeutils/ark/kerfuffle/queries.cpp #1186943:1186944
@@ -175,7 +175,7 @@
QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
QWeakPointer<KPasswordDialog> dlg = new KPasswordDialog;
- dlg.data()->setPrompt(i18n("The archive '%1' is password protected. Please enter \
the password to extract the file.", m_data.value(QLatin1String( "archiveFilename" \
)).toString())); + dlg.data()->setPrompt(i18n("The archive <filename>%1</filename> \
is password protected. Please enter the password to extract the file.", \
m_data.value(QLatin1String( "archiveFilename" )).toString()));
if (m_data.value(QLatin1String("incorrectTryAgain")).toBool()) {
dlg.data()->showErrorMessage(i18n("Incorrect password, please try again."), \
KPasswordDialog::PasswordError);
--- trunk/KDE/kdeutils/ark/plugins/karchiveplugin/karchiveplugin.cpp #1186943:1186944
@@ -61,7 +61,7 @@
{
kDebug();
if (!archive()->isOpen() && !archive()->open(QIODevice::ReadOnly)) {
- error(i18n("Could not open the archive '%1' for reading", filename()));
+ error(i18n("Could not open the archive <filename>%1</filename> for reading", \
filename())); return false;
} else {
return browseArchive(archive());
@@ -71,7 +71,7 @@
bool KArchiveInterface::copyFiles(const QList<QVariant> & files, const QString & \
destinationDirectory, bool preservePaths) {
if (!archive()->isOpen() && !archive()->open(QIODevice::ReadOnly)) {
- error(i18n("Could not open the archive '%1' for reading", filename()));
+ error(i18n("Could not open the archive <filename>%1</filename> for reading", \
filename())); return false;
}
@@ -79,7 +79,7 @@
QString realDestination = destinationDirectory;
const KArchiveEntry *archiveEntry = \
archive()->directory()->entry(file.toString()); if (!archiveEntry) {
- error(i18n("File '%1' not found in the archive" , file.toString()));
+ error(i18n("File <filename>%1</filename> not found in the archive" , \
file.toString())); return false;
}
@@ -148,7 +148,7 @@
archive()->close();
}
if (!archive()->open(QIODevice::ReadWrite)) {
- error(i18n("Could not open the archive '%1' for writing.", filename()));
+ error(i18n("Could not open the archive <filename>%1</filename> for \
writing.", filename())); return false;
}
@@ -165,7 +165,7 @@
createEntryFor(entry, "");
processDir((KArchiveDirectory*) \
archive()->directory()->entry(fi.fileName()), fi.fileName()); } else {
- error(i18n("Could not add the directory %1 to the archive", path));
+ error(i18n("Could not add the directory <filename>%1</filename> to \
the archive", path)); return false;
}
} else {
@@ -173,7 +173,7 @@
const KArchiveEntry *entry = \
archive()->directory()->entry(fi.fileName()); createEntryFor(entry, "");
} else {
- error(i18n("Could not add the file %1 to the archive.", path));
+ error(i18n("Could not add the file <filename>%1</filename> to the \
archive.", path)); return false;
}
}
--- trunk/KDE/kdeutils/ark/plugins/libarchive/libarchivehandler.cpp #1186943:1186944
@@ -99,7 +99,7 @@
}
if (archive_read_open_filename(arch_reader.data(), \
QFile::encodeName(filename()), 10240) != ARCHIVE_OK) {
- error(i18n("Could not open the file '%1', libarchive cannot handle it.",
+ error(i18n("Could not open the archive <filename>%1</filename>, libarchive \
cannot handle it.", filename()), QString());
return false;
}
@@ -122,7 +122,7 @@
}
if (result != ARCHIVE_EOF) {
- error(i18n("The archive reading failed with message: %1",
+ error(i18n("The archive reading failed with the following error: \
<message>%1</message>",
QLatin1String( archive_error_string(arch_reader.data()))) );
return false;
}
@@ -156,7 +156,7 @@
}
if (archive_read_open_filename(arch.data(), QFile::encodeName(filename()), \
10240) != ARCHIVE_OK) {
- error(i18n("Unable to open the file '%1', libarchive cannot handle it.",
+ error(i18n("Could not open the archive <filename>%1</filename>, libarchive \
cannot handle it.", filename()));
return false;
}
@@ -391,7 +391,7 @@
}
if (ret != ARCHIVE_OK) {
- error(i18n("Setting compression failed with the error '%1'",
+ error(i18n("Setting the compression method failed with the following \
error: <message>%1</message>",
QLatin1String(archive_error_string(arch_writer.data()))));
return false;
@@ -423,14 +423,14 @@
}
if (ret != ARCHIVE_OK) {
- error(i18n("Setting compression failed with the error '%1'", \
QLatin1String(archive_error_string(arch_writer.data())))); + \
error(i18n("Setting the compression method failed with the following error: \
<message>%1</message>", QLatin1String(archive_error_string(arch_writer.data())))); \
return false; }
}
ret = archive_write_open_filename(arch_writer.data(), \
QFile::encodeName(tempFilename)); if (ret != ARCHIVE_OK) {
- error(i18n("Opening the archive for writing failed with error message '%1'", \
QLatin1String(archive_error_string(arch_writer.data())))); + \
error(i18n("Opening the archive for writing failed with the following error: \
<message>%1</message>", QLatin1String(archive_error_string(arch_writer.data())))); \
return false; }
@@ -568,13 +568,13 @@
}
if (ret != ARCHIVE_OK) {
- error(i18n("Setting compression failed with the error '%1'", \
QLatin1String(archive_error_string(arch_writer.data())))); + \
error(i18n("Setting the compression method failed with the following error: \
<message>%1</message>", QLatin1String(archive_error_string(arch_writer.data())))); \
return false; }
ret = archive_write_open_filename(arch_writer.data(), \
QFile::encodeName(tempFilename)); if (ret != ARCHIVE_OK) {
- error(i18n("Opening the archive for writing failed with error message '%1'", \
QLatin1String(archive_error_string(arch_writer.data())))); + \
error(i18n("Opening the archive for writing failed with the following error: \
<message>%1</message>", QLatin1String(archive_error_string(arch_writer.data())))); \
return false; }
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic