diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts index f5c5172b2..1928a58e9 100644 --- a/share/translations/keepassxc_en.ts +++ b/share/translations/keepassxc_en.ts @@ -701,10 +701,6 @@ AutoTypePlatformX11 - - Trying to send invalid keysym. - - Sequence aborted: Caps Lock is on @@ -717,6 +713,10 @@ Unable to get valid keycode for key: + + Trying to send invalid keyboard symbol. + + AutoTypeSelectDialog @@ -2851,10 +2851,6 @@ Would you like to correct it? EditEntryWidgetBrowser - - These settings affect to the entry's behaviour with the browser extension. - - General @@ -2883,10 +2879,6 @@ Would you like to correct it? Do not use this entry with HTTP Basic Auth - - Additional URL's - - Add @@ -2899,6 +2891,14 @@ Would you like to correct it? Edit + + These settings affect the entry's behaviour with the browser extension. + + + + Additional URLs + + EditEntryWidgetHistory @@ -8209,10 +8209,6 @@ Kernel: %3 %4 read password of the database from stdin - - Locked databases. - - Database failed to lock. @@ -8272,19 +8268,16 @@ Kernel: %3 %4 - Edit a database. + Set the key file for the database. +This option is deprecated, use --set-key-file instead. - Could not change the database key. + Databases have been locked. - Database was not modified. - - - - Successfully edited the database. + Attestation not supported @@ -8315,11 +8308,6 @@ Kernel: %3 %4 Found unexpected Key type %1 - - Set the key file for the database. -This options is deprecated, use --set-key-file instead. - - KeePassXC is not running. No open database to lock @@ -8364,10 +8352,6 @@ This options is deprecated, use --set-key-file instead. Access to all entries is denied - - Attestation not supported - - Favorite Tag for favorite entries @@ -8438,6 +8422,10 @@ This options is deprecated, use --set-key-file instead. 1Password Import + + Credential is excluded + + Passkeys request canceled @@ -8454,6 +8442,22 @@ This options is deprecated, use --set-key-file instead. Invalid URL provided + + Edit a database. + + + + Could not change the database key. + + + + Database was not modified. + + + + Successfully edited the database. + + Cannot remove password: The database does not have a password. @@ -8462,10 +8466,6 @@ This options is deprecated, use --set-key-file instead. Cannot remove file key: The database does not have a file key. - - Credential is excluded - - QtIOCompressor @@ -9165,26 +9165,10 @@ This options is deprecated, use --set-key-file instead. Confirm when passwords are retrieved by clients - - <html><head/><body><p><span style=" - font-family:'-apple-system','BlinkMacSystemFont','Segoe UI','Helvetica','Arial','sans-serif','Apple Color - Emoji','Segoe UI Emoji'; font-size:14px; color:#24292e; background-color:#ffffff;">This setting does - not override disabling recycle bin prompts</span></p></body></html> - - - Confirm when clients request entry deletion - - <html><head/><body><p>This improves compatibility with certain applications - which search for password without unlocking the database first.</p><p>But enabling this may also - crash the client if the database can not be unlocked within a certain timeout. (Usually 25s, but may be a - different value set in applications.)</p></body></html> - - - Prompt to unlock database before searching @@ -9209,6 +9193,14 @@ This options is deprecated, use --set-key-file instead. Save current changes to activate the plugin and enable editing of this section. + + <html><head/><body><p>This setting does not override disabling recycle bin prompts </p></body></html> + + + + <html><head/><body><p>This improves compatibility with certain applications which search for password without unlocking the database first.</p><p>But enabling this may also crash the client if the database can not be unlocked within a certain timeout. (Usually 25s, but may be a different value set in applications.) </p></body></html> + + SettingsWidgetKeeShare diff --git a/src/autotype/xcb/AutoTypeXCB.cpp b/src/autotype/xcb/AutoTypeXCB.cpp index f2b967656..97b9d5908 100644 --- a/src/autotype/xcb/AutoTypeXCB.cpp +++ b/src/autotype/xcb/AutoTypeXCB.cpp @@ -485,7 +485,7 @@ bool AutoTypePlatformX11::RemapKeycode(KeySym keysym) AutoTypeAction::Result AutoTypePlatformX11::sendKey(KeySym keysym, unsigned int modifiers) { if (keysym == NoSymbol) { - return AutoTypeAction::Result::Failed(tr("Trying to send invalid keysym.")); + return AutoTypeAction::Result::Failed(tr("Trying to send invalid keyboard symbol.")); } int keycode; diff --git a/src/cli/DatabaseCreate.cpp b/src/cli/DatabaseCreate.cpp index 10b424825..adebda4c3 100644 --- a/src/cli/DatabaseCreate.cpp +++ b/src/cli/DatabaseCreate.cpp @@ -31,7 +31,7 @@ const QCommandLineOption DatabaseCreate::DecryptionTimeOption = const QCommandLineOption DatabaseCreate::SetKeyFileShortOption = QCommandLineOption( QStringList() << "k", - QObject::tr("Set the key file for the database.\nThis options is deprecated, use --set-key-file instead."), + QObject::tr("Set the key file for the database.\nThis option is deprecated, use --set-key-file instead."), QObject::tr("path")); const QCommandLineOption DatabaseCreate::SetKeyFileOption = diff --git a/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.ui b/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.ui index bed666676..9c7ddb007 100644 --- a/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.ui +++ b/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.ui @@ -72,11 +72,7 @@ - <html><head/><body><p><span style=" - font-family:'-apple-system','BlinkMacSystemFont','Segoe UI','Helvetica','Arial','sans-serif','Apple Color - Emoji','Segoe UI Emoji'; font-size:14px; color:#24292e; background-color:#ffffff;">This setting does - not override disabling recycle bin prompts</span></p></body></html> - + <html><head/><body><p>This setting does not override disabling recycle bin prompts </p></body></html> Confirm when clients request entry deletion @@ -89,11 +85,7 @@ - <html><head/><body><p>This improves compatibility with certain applications - which search for password without unlocking the database first.</p><p>But enabling this may also - crash the client if the database can not be unlocked within a certain timeout. (Usually 25s, but may be a - different value set in applications.)</p></body></html> - + <html><head/><body><p>This improves compatibility with certain applications which search for password without unlocking the database first.</p><p>But enabling this may also crash the client if the database can not be unlocked within a certain timeout. (Usually 25s, but may be a different value set in applications.) </p></body></html> Prompt to unlock database before searching diff --git a/src/gui/entry/EditEntryWidgetBrowser.ui b/src/gui/entry/EditEntryWidgetBrowser.ui index 093d141e8..8c3697597 100644 --- a/src/gui/entry/EditEntryWidgetBrowser.ui +++ b/src/gui/entry/EditEntryWidgetBrowser.ui @@ -6,7 +6,7 @@ 0 0 - 400 + 374 348 @@ -26,7 +26,7 @@ - These settings affect to the entry's behaviour with the browser extension. + These settings affect the entry's behaviour with the browser extension. @@ -86,7 +86,7 @@ - Additional URL's + Additional URLs diff --git a/src/main.cpp b/src/main.cpp index f0c987fac..6c3efea9d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -138,7 +138,7 @@ int main(int argc, char** argv) if (app.isAlreadyRunning()) { if (parser.isSet(lockOption)) { if (app.sendLockToInstance()) { - qInfo() << QObject::tr("Locked databases.").toUtf8().constData(); + qInfo() << QObject::tr("Databases have been locked.").toUtf8().constData(); } else { qWarning() << QObject::tr("Database failed to lock.").toUtf8().constData(); return EXIT_FAILURE;