diff --git a/share/translations/keepassx_en.ts b/share/translations/keepassx_en.ts index 99433922..bbf574b4 100644 --- a/share/translations/keepassx_en.ts +++ b/share/translations/keepassx_en.ts @@ -3,14 +3,6 @@ AboutDialog - - About KeePassX - - - - KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3. - - Revision @@ -19,13 +11,17 @@ Using: + + About KeePassXC + + + + KeePassXC is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3. + + AccessControlDialog - - KeyPassX/Http: Confirm Access - - Remember this decision @@ -43,15 +39,19 @@ Please select whether you want to allow access. + + KeePassXC HTTP Confirm Access + + AutoType - Auto-Type - KeePassX + Couldn't find an entry that matches the window title: - Couldn't find an entry that matches the window title: + Auto-Type - KeePassXC @@ -73,11 +73,11 @@ Please select whether you want to allow access. AutoTypeSelectDialog - Auto-Type - KeePassX + Select entry to Auto-Type: - Select entry to Auto-Type: + Auto-Type - KeePassXC @@ -342,11 +342,6 @@ Save changes? locked - - The database you are trying to open is locked by another instance of KeePassX. -Do you want to open it anyway? Alternatively the database is opened read-only. - - Lock database @@ -385,12 +380,21 @@ Discard changes and close anyway? - The database you are trying to save as is locked by another instance of KeePassX. -Do you want to save it anyway? + Unable to open the database. - Unable to open the database. + The database you are trying to open is locked by another instance of KeePassXC. +Do you want to open it anyway? Alternatively the database is opened read-only. + + + + Merge database + + + + The database you are trying to save as is locked by another instance of KeePassXC. +Do you want to save it anyway? @@ -451,6 +455,26 @@ Do you want to save it anyway? Do you really want to move entry "%1" to the recycle bin? + + Searching... + + + + No current database. + + + + No source database, nothing to do. + + + + Search Results (%1) + + + + No Results + + EditEntryWidget @@ -992,7 +1016,7 @@ This is a one-way migration. You won't be able to open the imported databas - KeePassX - Error + KeePassXC - Error @@ -1002,102 +1026,14 @@ This is a one-way migration. You won't be able to open the imported databas Database - - Recent databases - - - - Help - - - - Entries - - - - Copy attribute to clipboard - - - - Groups - - - - View - - - - Quit - - - - About - - Open database - - Save database - - - - Close database - - - - New database - - - - Add new entry - - - - View/Edit entry - - - - Delete entry - - - - Add new group - - - - Edit group - - - - Delete group - - - - Save database as - - - - Change master key - - Database settings - - Import KeePass 1 database - - - - Clone entry - - - - Find - - Copy username to clipboard @@ -1110,30 +1046,6 @@ This is a one-way migration. You won't be able to open the imported databas Settings - - Perform Auto-Type - - - - Open URL - - - - Lock databases - - - - Title - - - - URL - - - - Notes - - Show toolbar @@ -1150,22 +1062,6 @@ This is a one-way migration. You won't be able to open the imported databas Tools - - Copy username - - - - Copy password - - - - Export to CSV file - - - - Repair database - - KeePass 2 Database @@ -1186,6 +1082,150 @@ This is a one-way migration. You won't be able to open the imported databas Writing the database failed. + + &Recent databases + + + + He&lp + + + + E&ntries + + + + Copy att&ribute to clipboard + + + + &Groups + + + + &View + + + + &Quit + + + + &About + + + + &Open database + + + + &Save database + + + + &Close database + + + + &New database + + + + Merge from KeePassX database + + + + &Add new entry + + + + &View/Edit entry + + + + &Delete entry + + + + &Add new group + + + + &Edit group + + + + &Delete group + + + + Sa&ve database as + + + + Change &master key + + + + &Database settings + + + + &Import KeePass 1 database + + + + &Clone entry + + + + &Find + + + + Copy &username + + + + Cop&y password + + + + &Settings + + + + &Perform Auto-Type + + + + &Open URL + + + + &Lock databases + + + + &Title + + + + &URL + + + + &Notes + + + + &Export to CSV file + + + + Re&pair database + + OptionDialog @@ -1193,11 +1233,6 @@ This is a one-way migration. You won't be able to open the imported databas Dialog - - Support KeypassHttp protocol -This is required for accessing keypass database from ChromeIPass or PassIfox - - General @@ -1211,10 +1246,6 @@ This is required for accessing keypass database from ChromeIPass or PassIfox - - Re&quest for unlocking the database if it is locked - - &Match URL schemes Only entries with the same scheme (http://, https://, ftp://, ...) are returned @@ -1224,10 +1255,6 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned< Sort matching entries by &username - - Sort matching entries by &title - - R&emove all shared encryption-keys from active database @@ -1288,6 +1315,19 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned< Default port: 19455 + + Enable KeepassXC Http protocol +This is required for accessing your databases from ChromeIPass or PassIFox + + + + Re&quest to unlock the database if it is locked + + + + Sort &matching entries by title + + PasswordGeneratorWidget @@ -1379,65 +1419,39 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned< Find: + + Case Sensitive + + + + Search Current Group + + Service - - KeyPassX/Http: New key association request - - - - You have received an association request for the above key. -If you would like to allow it access to your KeePassX database -give it a unique name to identify and accept it. - - - - KeyPassX/Http: Overwrite existing key? - - A shared encryption-key with the name "%1" already exists. Do you want to overwrite it? - - KeyPassX/Http: Update Entry - - Do you want to update the information in %1 - %2? - - KeyPassX/Http: Database locked! - - The active database is locked! Please unlock the selected database or choose another one which is unlocked. - - KeyPassX/Http: Removed keys from database - - Successfully removed %1 encryption-%2 from KeePassX/Http Settings. - - KeyPassX/Http: No keys found - - No shared encryption-keys found in KeePassHttp Settings. - - KeyPassX/Http: Settings not available! - - The active database does not contain an entry of KeePassHttp Settings. @@ -1450,20 +1464,54 @@ Please unlock the selected database or choose another one which is unlocked.Abort - - KeyPassX/Http: Removed permissions - - Successfully removed permissions from %1 %2. - KeyPassX/Http: No entry with permissions found! + The active database does not contain an entry with permissions. - The active database does not contain an entry with permissions. + KeePassXC: New key association request + + + + You have received an association request for the above key. +If you would like to allow it access to your KeePassXC database +give it a unique name to identify and accept it. + + + + KeePassXC: Overwrite existing key? + + + + KeePassXC: Update Entry + + + + KeePassXC: Database locked! + + + + KeePassXC: Removed keys from database + + + + KeePassXC: No keys found + + + + KeePassXC: Settings not available! + + + + KeePassXC: Removed permissions + + + + KeePassXC: No entry with permissions found! @@ -1563,6 +1611,10 @@ Please unlock the selected database or choose another one which is unlocked.Always ask before performing auto-type + + Lock databases after minimizing the window + + UnlockDatabaseWidget @@ -1580,10 +1632,6 @@ Please unlock the selected database or choose another one which is unlocked. main - - KeePassX - cross-platform password manager - - path to a custom config file @@ -1596,5 +1644,13 @@ Please unlock the selected database or choose another one which is unlocked.filename(s) of the password database(s) to open (*.kdbx) + + KeePassXC - cross-platform password manager + + + + read password of the database from stdin + + diff --git a/src/http/AccessControlDialog.ui b/src/http/AccessControlDialog.ui index 4faed6de..37d477ee 100644 --- a/src/http/AccessControlDialog.ui +++ b/src/http/AccessControlDialog.ui @@ -11,7 +11,7 @@ - KeyPassX/Http: Confirm Access + KeePassXC HTTP Confirm Access diff --git a/src/http/OptionDialog.ui b/src/http/OptionDialog.ui index 326507d5..ee09f953 100644 --- a/src/http/OptionDialog.ui +++ b/src/http/OptionDialog.ui @@ -6,8 +6,8 @@ 0 0 - 531 - 354 + 605 + 389 @@ -17,8 +17,8 @@ - Support KeypassHttp protocol -This is required for accessing keypass database from ChromeIPass or PassIfox + Enable KeepassXC Http protocol +This is required for accessing your databases from ChromeIPass or PassIFox @@ -53,7 +53,7 @@ of all entries for the whole domain - Re&quest for unlocking the database if it is locked + Re&quest to unlock the database if it is locked @@ -75,7 +75,7 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned< - Sort matching entries by &title + Sort &matching entries by title diff --git a/src/http/Service.cpp b/src/http/Service.cpp index d66b240d..ceec292d 100644 --- a/src/http/Service.cpp +++ b/src/http/Service.cpp @@ -146,7 +146,7 @@ QString Service::storeKey(const QString &key) bool ok; //Indicate who wants to associate, and request user to enter the 'name' of association key id = QInputDialog::getText(0, - tr("KeyPassX/Http: New key association request"), + tr("KeePassXC: New key association request"), tr("You have received an association " "request for the above key.\n" "If you would like to allow it access " @@ -158,7 +158,7 @@ QString Service::storeKey(const QString &key) //Warn if association key already exists } while(config->attributes()->contains(QLatin1String(ASSOCIATE_KEY_PREFIX) + id) && - QMessageBox::warning(0, tr("KeyPassXC/Http: Overwrite existing key?"), + QMessageBox::warning(0, tr("KeePassXC: Overwrite existing key?"), tr("A shared encryption-key with the name \"%1\" already exists.\nDo you want to overwrite it?").arg(id), QMessageBox::Yes | QMessageBox::No) == QMessageBox::No); @@ -479,7 +479,7 @@ void Service::updateEntry(const QString &, const QString &uuid, const QString &l if (u != login || entry->password() != password) { //ShowNotification(QString("%0: You have an entry change prompt waiting, click to activate").arg(requestId)); if ( HttpSettings::alwaysAllowUpdate() - || QMessageBox::warning(0, tr("KeyPassX/Http: Update Entry"), + || QMessageBox::warning(0, tr("KeePassXC: Update Entry"), tr("Do you want to update the information in %1 - %2?").arg(QUrl(url).host()).arg(u), QMessageBox::Yes|QMessageBox::No) == QMessageBox::Yes ) { entry->beginUpdate(); @@ -499,7 +499,7 @@ QString Service::generatePassword() void Service::removeSharedEncryptionKeys() { if (!isDatabaseOpened()) { - QMessageBox::critical(0, tr("KeyPassX/Http: Database locked!"), + QMessageBox::critical(0, tr("KeePassXC: Database locked!"), tr("The active database is locked!\n" "Please unlock the selected database or choose another one which is unlocked."), QMessageBox::Ok); @@ -516,16 +516,16 @@ void Service::removeSharedEncryptionKeys() entry->endUpdate(); const int count = keysToRemove.count(); - QMessageBox::information(0, tr("KeyPassX/Http: Removed keys from database"), + QMessageBox::information(0, tr("KeePassXC: Removed keys from database"), tr("Successfully removed %1 encryption-%2 from KeePassX/Http Settings.").arg(count).arg(count ? "keys" : "key"), QMessageBox::Ok); } else { - QMessageBox::information(0, tr("KeyPassX/Http: No keys found"), + QMessageBox::information(0, tr("KeePassXC: No keys found"), tr("No shared encryption-keys found in KeePassHttp Settings."), QMessageBox::Ok); } } else { - QMessageBox::information(0, tr("KeyPassX/Http: Settings not available!"), + QMessageBox::information(0, tr("KeePassXC: Settings not available!"), tr("The active database does not contain an entry of KeePassHttp Settings."), QMessageBox::Ok); } @@ -534,7 +534,7 @@ void Service::removeSharedEncryptionKeys() void Service::removeStoredPermissions() { if (!isDatabaseOpened()) { - QMessageBox::critical(0, tr("KeyPassX/Http: Database locked!"), + QMessageBox::critical(0, tr("KeePassXC: Database locked!"), tr("The active database is locked!\n" "Please unlock the selected database or choose another one which is unlocked."), QMessageBox::Ok); @@ -560,11 +560,11 @@ void Service::removeStoredPermissions() progress.reset(); if (counter > 0) { - QMessageBox::information(0, tr("KeyPassX/Http: Removed permissions"), + QMessageBox::information(0, tr("KeePassXC: Removed permissions"), tr("Successfully removed permissions from %1 %2.").arg(counter).arg(counter ? "entries" : "entry"), QMessageBox::Ok); } else { - QMessageBox::information(0, tr("KeyPassX/Http: No entry with permissions found!"), + QMessageBox::information(0, tr("KeePassXC: No entry with permissions found!"), tr("The active database does not contain an entry with permissions."), QMessageBox::Ok); }