From 873871a42ce93c8a998a4c41db9554819dce3ea5 Mon Sep 17 00:00:00 2001 From: Edward Jones Date: Sat, 18 Feb 2017 14:51:01 +0000 Subject: [PATCH] Update text in HTTP settings and a hard-to-translate command line hint --- share/translations/keepassx_en.ts | 50 +++++++++++++++---------------- src/http/OptionDialog.ui | 10 +++---- src/main.cpp | 2 +- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/share/translations/keepassx_en.ts b/share/translations/keepassx_en.ts index a6e09aa23..ef6766f5f 100644 --- a/share/translations/keepassx_en.ts +++ b/share/translations/keepassx_en.ts @@ -1297,11 +1297,6 @@ This is a one-way migration. You won't be able to open the imported databas Sh&ow a notification when credentials are requested - - &Return only best matching entries for an URL instead -of all entries for the whole domain - - &Match URL schemes Only entries with the same scheme (http://, https://, ftp://, ...) are returned @@ -1311,10 +1306,6 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned< Sort matching entries by &username - - R&emove all shared encryption-keys from active database - - Re&move all stored permissions from entries in active database @@ -1327,10 +1318,6 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned< Advanced - - Activate the following only, if you know what you are doing! - - Always allow &access to entries @@ -1347,14 +1334,6 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned< Only the selected database has to be connected with a client! - - &Return also advanced string fields which start with "KPH: " - - - - Automatic creates or updates are not supported for string fields! - - HTTP Port: @@ -1389,6 +1368,27 @@ This is required for accessing your databases from ChromeIPass or PassIFox + + &Return only best matching entries for a URL instead +of all entries for the whole domain + + + + R&emove all shared encryption keys from active database + + + + The following options can be dangerous. Change them only if you know what you are doing. + + + + &Return advanced string fields which start with "KPH: " + + + + Automatically creating or updating string fields is not supported. + + PasswordGeneratorWidget @@ -1761,10 +1761,6 @@ give it a unique name to identify and accept it. key file of the database - - filename(s) of the password database(s) to open (*.kdbx) - - KeePassXC - cross-platform password manager @@ -1773,5 +1769,9 @@ give it a unique name to identify and accept it. read password of the database from stdin + + filenames of the password databases to open (*.kdbx) + + diff --git a/src/http/OptionDialog.ui b/src/http/OptionDialog.ui index ab8047db4..c9aae49ef 100644 --- a/src/http/OptionDialog.ui +++ b/src/http/OptionDialog.ui @@ -45,7 +45,7 @@ This is required for accessing your databases from ChromeIPass or PassIFox - &Return only best matching entries for an URL instead + &Return only best matching entries for a URL instead of all entries for the whole domain @@ -82,7 +82,7 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned< - R&emove all shared encryption-keys from active database + R&emove all shared encryption keys from active database @@ -148,7 +148,7 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned< color: rgb(255, 0, 0); - Activate the following only, if you know what you are doing! + The following options can be dangerous. Change them only if you know what you are doing. @@ -186,14 +186,14 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned< - &Return also advanced string fields which start with "KPH: " + &Return advanced string fields which start with "KPH: " - Automatic creates or updates are not supported for string fields! + Automatically creating or updating string fields is not supported. 30 diff --git a/src/main.cpp b/src/main.cpp index a9ab4c4aa..0618cefae 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -64,7 +64,7 @@ int main(int argc, char** argv) QCommandLineParser parser; parser.setApplicationDescription(QCoreApplication::translate("main", "KeePassXC - cross-platform password manager")); - parser.addPositionalArgument("filename", QCoreApplication::translate("main", "filename(s) of the password database(s) to open (*.kdbx)"), "[filename(s)]"); + parser.addPositionalArgument("filename", QCoreApplication::translate("main", "filenames of the password databases to open (*.kdbx)"), "[filename(s)]"); QCommandLineOption configOption("config", QCoreApplication::translate("main", "path to a custom config file"),