Martchus
/
passwordmanager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix typos found via `codespell --skip .git -w`

This commit is contained in:
Martchus 2021-07-03 19:46:22 +02:00
parent acbfd6ec6b
commit 3a01f2de31
9 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -15,7 +15,7 @@ set(META_USE_QQC2 ON)
set(META_ANDROID_PACKAGE_NAME "org.martchus.passwordmanager")
set(META_VERSION_MAJOR 4)
set(META_VERSION_MINOR 1)
set(META_VERSION_PATCH 7)
set(META_VERSION_PATCH 8)
# add project files
set(HEADER_FILES cli/cli.h model/entryfiltermodel.h model/entrymodel.h model/fieldmodel.h)

4
README.md
View File

@ -71,7 +71,7 @@ The Password Manager depends on c++utilities and passwordfile. Checkout the READ
### Building this straight
1. Install (preferably the latest version of) GCC or Clang, the required Qt modules, CMake and Ninja/Make. OpenSSL, iconv and
zlib are required as well but likely already installed.
2. Get the sources of additional dependencies and the password manager itself. For the lastest version from Git clone the following repositories:
2. Get the sources of additional dependencies and the password manager itself. For the latest version from Git clone the following repositories:
```
cd $SOURCES
git clone https://github.com/Martchus/cpp-utilities.git c++utilities
@ -211,7 +211,7 @@ make passwordmanager_deploy_apk
##### Notes
* The Android packages for the dependencies Qt, iconv, OpenSSL and Kirigami 2 are provided in
my [PKGBUILDs](http://github.com/Martchus/PKGBUILDs) repo.
* The lastest Java I was able to use was version 8 (`jdk8-openjdk` package).
* The latest Java I was able to use was version 8 (`jdk8-openjdk` package).
### Manual deployment of Android APK file
1. Find device ID: `adb devices`

16
cli/cli.cpp
View File

@ -252,13 +252,13 @@ void InteractiveCli::openFile(const string &file, PasswordFileOpenFlags openFlag
m_currentEntry = m_file.rootEntry();
m_o << "file \"" << file << "\" opened" << endl;
} catch (const ParsingException &) {
m_o << "error occured when parsing file \"" << file << "\"" << endl;
m_o << "error occurred when parsing file \"" << file << "\"" << endl;
throw;
} catch (const CryptoException &) {
m_o << "error occured when decrypting file \"" << file << "\"" << endl;
m_o << "error occurred when decrypting file \"" << file << "\"" << endl;
throw;
} catch (const std::ios_base::failure &) {
m_o << "IO error occured when opening file \"" << file << "\"" << endl;
m_o << "IO error occurred when opening file \"" << file << "\"" << endl;
throw;
}
} catch (const std::exception &e) {
@ -303,13 +303,13 @@ void InteractiveCli::saveFile()
m_file.save(flags);
m_o << "file \"" << m_file.path() << "\" saved" << endl;
} catch (const ParsingException &) {
m_o << "error occured when parsing file \"" << m_file.path() << "\"" << endl;
m_o << "error occurred when parsing file \"" << m_file.path() << "\"" << endl;
throw;
} catch (const CryptoException &) {
m_o << "error occured when encrypting file \"" << m_file.path() << "\"" << endl;
m_o << "error occurred when encrypting file \"" << m_file.path() << "\"" << endl;
throw;
} catch (const std::ios_base::failure &) {
m_o << "IO error occured when saving file \"" << m_file.path() << "\"" << endl;
m_o << "IO error occurred when saving file \"" << m_file.path() << "\"" << endl;
throw;
}
} catch (const exception &e) {
@ -337,7 +337,7 @@ void InteractiveCli::createFile(const string &file)
m_currentEntry = m_file.rootEntry();
m_o << "file \"" << file << "\" created and opened" << endl;
} catch (const std::ios_base::failure &) {
m_o << "IO error occured when creating file \"" << file << "\"" << endl;
m_o << "IO error occurred when creating file \"" << file << "\"" << endl;
throw;
}
} catch (const exception &e) {
@ -407,7 +407,7 @@ void InteractiveCli::cd(const string &path)
void InteractiveCli::ls()
{
if (!m_file.isOpen()) {
m_o << "can not list any entires; no file open" << endl;
m_o << "can not list any entries; no file open" << endl;
return;
}
switch (m_currentEntry->type()) {

4
gui/mainwindow.cpp
View File

@ -432,7 +432,7 @@ bool MainWindow::openFile(const QString &path, PasswordFileOpenFlags openFlags)
}
// show error message
const QString errmsg = tr("An IO error occured when opening the specified file \"%1\": %2").arg(path, QString::fromLocal8Bit(failure.what()));
const QString errmsg = tr("An IO error occurred when opening the specified file \"%1\": %2").arg(path, QString::fromLocal8Bit(failure.what()));
m_ui->statusBar->showMessage(errmsg, 5000);
QMessageBox::critical(this, QApplication::applicationName(), errmsg);
return false;
@ -827,7 +827,7 @@ bool MainWindow::saveFile()
try {
m_file.doBackup();
} catch (const std::ios_base::failure &failure) {
const QString message(tr("An IO error occured when making the backup file: %1").arg(QString::fromLocal8Bit(failure.what())));
const QString message(tr("An IO error occurred when making the backup file: %1").arg(QString::fromLocal8Bit(failure.what())));
QMessageBox::critical(this, QApplication::applicationName(), message);
m_ui->statusBar->showMessage(message, 7000);
return false;

2
gui/undocommands.cpp
View File

@ -439,7 +439,7 @@ bool EntryModelMoveRowsCommand::internalUndo()
if (sourceParentEntry && destParentEntry) {
int sourceRow = m_destChild;
int destChild = m_sourceRow;
// moves whithin the same parent needs special consideration
// moves within the same parent needs special consideration
if (sourceParentEntry == destParentEntry) {
// move entry down
if (m_sourceRow < m_destChild) {

2
model/fieldmodel.cpp
View File

@ -255,7 +255,7 @@ bool FieldModel::setData(const QModelIndex &index, const QVariant &value, int ro
if (roles.isEmpty()) {
return false;
}
// emit data changed signal on sucess
// emit data changed signal on success
emit dataChanged(index, index, roles);
return true;
}

14
quickgui/controller.cpp
View File

@ -129,7 +129,7 @@ void Controller::load()
m_file.load();
m_entryModel.setRootEntry(m_file.rootEntry());
if (!m_entryModel.rootEntry()) {
emit fileError(tr("An error occured when opening the file: root element missing"), QStringLiteral("load"));
emit fileError(tr("An error occurred when opening the file: root element missing"), QStringLiteral("load"));
return;
}
setFileOpen(true);
@ -140,7 +140,7 @@ void Controller::load()
} else {
// clear password since the password which has been provided likely wasn't correct
clearPassword();
emit fileError(tr("A crypto error occured when opening the file: ") + QString::fromLocal8Bit(e.what()), QStringLiteral("load"));
emit fileError(tr("A crypto error occurred when opening the file: ") + QString::fromLocal8Bit(e.what()), QStringLiteral("load"));
}
} catch (...) {
if ((m_file.saveOptions() & PasswordFileSaveFlags::Encryption) && m_password.isEmpty()) {
@ -230,7 +230,7 @@ void Controller::save()
#endif
emit fileSaved();
} catch (const CryptoException &e) {
emit fileError(tr("A crypto error occured when saving the file: ") + QString::fromLocal8Bit(e.what()), QStringLiteral("save"));
emit fileError(tr("A crypto error occurred when saving the file: ") + QString::fromLocal8Bit(e.what()), QStringLiteral("save"));
} catch (...) {
emitFileError(tr("saving"));
}
@ -452,14 +452,14 @@ void Controller::emitFileError(const QString &when)
throw;
} catch (const std::ios_base::failure &failure) {
emit fileError(
tr("An IO error occured when %1 the file %2: ").arg(when, m_filePath) + QString::fromLocal8Bit(failure.what()), QStringLiteral("load"));
tr("An IO error occurred when %1 the file %2: ").arg(when, m_filePath) + QString::fromLocal8Bit(failure.what()), QStringLiteral("load"));
} catch (const runtime_error &e) {
emit fileError(tr("An error occured when %1 the file: ").arg(when) + QString::fromLocal8Bit(e.what()), QStringLiteral("save"));
emit fileError(tr("An error occurred when %1 the file: ").arg(when) + QString::fromLocal8Bit(e.what()), QStringLiteral("save"));
} catch (const exception &e) {
emit fileError(tr("An unknown exception occured when %1 the file %2: ").arg(when, m_filePath) + QString::fromLocal8Bit(e.what()),
emit fileError(tr("An unknown exception occurred when %1 the file %2: ").arg(when, m_filePath) + QString::fromLocal8Bit(e.what()),
QStringLiteral("load"));
} catch (...) {
emit fileError(tr("An unknown error occured when %1 the file %2.").arg(when, m_filePath), QStringLiteral("load"));
emit fileError(tr("An unknown error occurred when %1 the file %2.").arg(when, m_filePath), QStringLiteral("load"));
}
}

26
translations/passwordmanager_de_DE.ts
View File

@ -258,16 +258,16 @@
<name>QtGui::Controller</name>
<message>
<location filename="../quickgui/controller.cpp" line="132"/>
<source>An error occured when opening the file: root element missing</source>
<source>An error occurred when opening the file: root element missing</source>
<translation>Die Datei konnte nicht geöffnet werden, weil das Root-Element fehlt.</translation>
</message>
<message>
<location filename="../quickgui/controller.cpp" line="143"/>
<source>A crypto error occured when opening the file: </source>
<source>A crypto error occurred when opening the file: </source>
<translation>Ein Verschlüsselungsfehler ist beim Öffnen der Datei aufgetreten: </translation>
</message>
<message>
<source>A parsing error occured when opening the file: </source>
<source>A parsing error occurred when opening the file: </source>
<translation type="vanished">Die Datei konnte nicht richtig eingelesen werden: </translation>
</message>
<message>
@ -293,11 +293,11 @@
</message>
<message>
<location filename="../quickgui/controller.cpp" line="233"/>
<source>A crypto error occured when saving the file: </source>
<source>A crypto error occurred when saving the file: </source>
<translation>Ein Verschlüsselungsfehler ist beim Speichern der Datei aufgetreten: </translation>
</message>
<message>
<source>An internal error occured when saving the file: </source>
<source>An internal error occurred when saving the file: </source>
<translation type="vanished">Ein interner Fehler ist beim Speichern der Datei aufgetreten: </translation>
</message>
<message>
@ -321,22 +321,22 @@
</message>
<message>
<location filename="../quickgui/controller.cpp" line="455"/>
<source>An IO error occured when %1 the file %2: </source>
<source>An IO error occurred when %1 the file %2: </source>
<translation>Ein Ein- bzw. Ausgabefehler ist %1 der Datei %2 aufgetreten: </translation>
</message>
<message>
<location filename="../quickgui/controller.cpp" line="457"/>
<source>An error occured when %1 the file: </source>
<source>An error occurred when %1 the file: </source>
<translation>Ein Fehler ist %1 der Datei aufgetreten: </translation>
</message>
<message>
<location filename="../quickgui/controller.cpp" line="459"/>
<source>An unknown exception occured when %1 the file %2: </source>
<source>An unknown exception occurred when %1 the file %2: </source>
<translation>Eine unbekannte Ausnahme ist %1 der Datei %2 aufgetreten: </translation>
</message>
<message>
<location filename="../quickgui/controller.cpp" line="462"/>
<source>An unknown error occured when %1 the file %2.</source>
<source>An unknown error occurred when %1 the file %2.</source>
<translation>Ein unbekannter Fehler ist %1 der Datei %2 aufgetreten.</translation>
</message>
</context>
@ -679,7 +679,7 @@
<translation>Änderungshistorie</translation>
</message>
<message>
<source>An IO error occured when opening the specified file &quot;%1&quot;.
<source>An IO error occurred when opening the specified file &quot;%1&quot;.
(%2)</source>
<translation type="vanished">Beim Öffnen der Datei &quot;%1&quot; ist ein Ein-/Ausgabefehler aufgetreten.
@ -778,7 +778,7 @@ OpenSSL-Fehler: %1</translation>
<translation>Passwortdatei wurde geschlossen.</translation>
</message>
<message>
<source>The backup file couldn&apos;t be created because in IO error occured: %1</source>
<source>The backup file couldn&apos;t be created because in IO error occurred: %1</source>
<translation type="vanished">Die Backupdatei konnte aufgrund eines Ein-/Ausgabefehlers nicht erstellt werden: %1</translation>
</message>
<message>
@ -881,7 +881,7 @@ OpenSSL-Fehler: %1</translation>
</message>
<message>
<location filename="../gui/mainwindow.cpp" line="435"/>
<source>An IO error occured when opening the specified file &quot;%1&quot;: %2</source>
<source>An IO error occurred when opening the specified file &quot;%1&quot;: %2</source>
<translation>Beim Öffnen der Datei &quot;%1&quot; ist ein Ein-/Ausgabefehler aufgetreten: %2</translation>
</message>
<message>
@ -896,7 +896,7 @@ OpenSSL-Fehler: %1</translation>
</message>
<message>
<location filename="../gui/mainwindow.cpp" line="830"/>
<source>An IO error occured when making the backup file: %1</source>
<source>An IO error occurred when making the backup file: %1</source>
<translation>Beim Erstellen der Backup-Datei ist ein Ein-/Ausgabefehler aufgetreten: %1</translation>
</message>
<message>

18
translations/passwordmanager_en_US.ts
View File

@ -220,12 +220,12 @@
<name>QtGui::Controller</name>
<message>
<location filename="../quickgui/controller.cpp" line="132"/>
<source>An error occured when opening the file: root element missing</source>
<source>An error occurred when opening the file: root element missing</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../quickgui/controller.cpp" line="143"/>
<source>A crypto error occured when opening the file: </source>
<source>A crypto error occurred when opening the file: </source>
<translation type="unfinished"></translation>
</message>
<message>
@ -251,7 +251,7 @@
</message>
<message>
<location filename="../quickgui/controller.cpp" line="233"/>
<source>A crypto error occured when saving the file: </source>
<source>A crypto error occurred when saving the file: </source>
<translation type="unfinished"></translation>
</message>
<message>
@ -271,22 +271,22 @@
</message>
<message>
<location filename="../quickgui/controller.cpp" line="455"/>
<source>An IO error occured when %1 the file %2: </source>
<source>An IO error occurred when %1 the file %2: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../quickgui/controller.cpp" line="457"/>
<source>An error occured when %1 the file: </source>
<source>An error occurred when %1 the file: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../quickgui/controller.cpp" line="459"/>
<source>An unknown exception occured when %1 the file %2: </source>
<source>An unknown exception occurred when %1 the file %2: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../quickgui/controller.cpp" line="462"/>
<source>An unknown error occured when %1 the file %2.</source>
<source>An unknown error occurred when %1 the file %2.</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -797,7 +797,7 @@ OpenSSL error queue: %1</source>
</message>
<message>
<location filename="../gui/mainwindow.cpp" line="435"/>
<source>An IO error occured when opening the specified file &quot;%1&quot;: %2</source>
<source>An IO error occurred when opening the specified file &quot;%1&quot;: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -812,7 +812,7 @@ OpenSSL error queue: %1</source>
</message>
<message>
<location filename="../gui/mainwindow.cpp" line="830"/>
<source>An IO error occured when making the backup file: %1</source>
<source>An IO error occurred when making the backup file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>