From f67b60623e3101c8c891dc8947b2972559e1779a Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Tue, 19 Mar 2019 17:08:18 -0400 Subject: [PATCH] Update translation source file --- .tx/config | 2 +- share/translations/keepassx_en.ts | 360 ++++++++++++++---------- src/browser/BrowserOptionDialog.cpp | 2 +- src/gui/group/GroupModel.cpp | 2 +- src/keeshare/SettingsWidgetKeeShare.cpp | 2 +- 5 files changed, 221 insertions(+), 147 deletions(-) diff --git a/.tx/config b/.tx/config index 3fcd5b969..2092a4bb5 100644 --- a/.tx/config +++ b/.tx/config @@ -1,7 +1,7 @@ [main] host = https://www.transifex.com -[keepassxc.keepassx_ents] +[keepassxc.keepassxc] source_file = share/translations/keepassx_en.ts file_filter = share/translations/keepassx_.ts source_lang = en diff --git a/share/translations/keepassx_en.ts b/share/translations/keepassx_en.ts index 2cfb15456..1f6b00076 100644 --- a/share/translations/keepassx_en.ts +++ b/share/translations/keepassx_en.ts @@ -1,4 +1,6 @@ - + + + AboutDialog @@ -37,30 +39,6 @@ Copy to clipboard Copy to clipboard - - Revision: %1 - Revision: %1 - - - Distribution: %1 - Distribution: %1 - - - Libraries: - Libraries: - - - Operating system: %1 -CPU architecture: %2 -Kernel: %3 %4 - Operating system: %1 -CPU architecture: %2 -Kernel: %3 %4 - - - Enabled extensions: - Enabled extensions: - Project Maintainers: Project Maintainers: @@ -69,50 +47,6 @@ Kernel: %3 %4 Special thanks from the KeePassXC team go to debfx for creating the original KeePassX. Special thanks from the KeePassXC team go to debfx for creating the original KeePassX. - - Version %1 - Version %1 - - - Build Type: %1 - Build Type: %1 - - - Auto-Type - Auto-Type - - - Browser Integration - Browser Integration - - - SSH Agent - SSH Agent - - - YubiKey - YubiKey - - - TouchID - TouchID - - - None - None - - - KeeShare (signed and unsigned sharing) - KeeShare (signed and unsigned sharing) - - - KeeShare (only signed sharing) - KeeShare (only signed sharing) - - - KeeShare (only unsigned sharing) - KeeShare (only unsigned sharing) - AgentSettingsWidget @@ -656,14 +590,6 @@ Please select the correct database for saving credentials. Select custom proxy location Select custom proxy location - - We're sorry, but KeePassXC-Browser is not supported for Snap releases at the moment. - We're sorry, but KeePassXC-Browser is not supported for Snap releases at the moment. - - - KeePassXC-Browser is needed for the browser integration to work. <br />Download it for %1 and %2. - KeePassXC-Browser is needed for the browser integration to work. <br />Download it for %1 and %2. - &Tor Browser &Tor Browser @@ -685,6 +611,18 @@ Please select the correct database for saving credentials. An extra HTTP Basic Auth setting Do not ask permission for HTTP &Basic Auth + + Due to Snap sandboxing, you must run a script to enable browser integration.<br />You can obtain this script from %1 + + + + Please see special instructions for browser extension use below + + + + KeePassXC-Browser is needed for the browser integration to work. <br />Download it for %1 and %2. %3 + + BrowserService @@ -744,7 +682,10 @@ Moved %2 keys to custom data. Successfully moved %n keys to custom data. - Successfully moved %n keys to custom data.Successfully moved %n keys to custom data. + + Successfully moved %n keys to custom data. + Successfully moved %n keys to custom data. + KeePassXC: No entry with KeePassHTTP attributes found! @@ -759,12 +700,20 @@ Moved %2 keys to custom data. KeePassXC: Legacy browser integration settings detected - Legacy browser integration settings have been detected. -Do you want to upgrade the settings to the latest standard? -This is necessary to maintain compatibility with the browser plugin. - Legacy browser integration settings have been detected. -Do you want to upgrade the settings to the latest standard? -This is necessary to maintain compatibility with the browser plugin. + KeePassXC: Create a new group + + + + A request for creating a new group "%1" has been received. +Do you want to create this group? + + + + + Your KeePassXC-Browser settings need to be moved into the database settings. +This is necessary to maintain your current browser connections. +Would you like to migrate your existing settings now? + @@ -870,7 +819,10 @@ This is necessary to maintain compatibility with the browser plugin. [%n more message(s) skipped] - [%n more message(s) skipped][%n more message(s) skipped] + + [%n more message(s) skipped] + [%n more message(s) skipped] + CSV import: writer has errors: @@ -883,7 +835,10 @@ This is necessary to maintain compatibility with the browser plugin.CsvParserModel %n column(s) - %n column(s)%n column(s) + + %n column(s) + %n column(s) + %1, %2, %3 @@ -892,11 +847,17 @@ This is necessary to maintain compatibility with the browser plugin. %n byte(s) - %n byte(s)%n byte(s) + + %n byte(s) + %n byte(s) + %n row(s) - %n row(s)%n row(s) + + %n row(s) + %n row(s) + @@ -926,6 +887,10 @@ This is necessary to maintain compatibility with the browser plugin.File cannot be written as it is opened in read-only mode. File cannot be written as it is opened in read-only mode. + + Key not transformed. This is a bug, please report it to the developers! + + DatabaseOpenDialog @@ -1001,7 +966,7 @@ Please consider generating a new key file. %1 - Can't open key file: + Can't open key file: %1 Can't open key file: %1 @@ -1113,7 +1078,10 @@ This may prevent connection to the browser plugin. Successfully removed %n encryption key(s) from KeePassXC settings. - Successfully removed %n encryption key(s) from KeePassXC settings.Successfully removed %n encryption key(s) from KeePassXC settings. + + Successfully removed %n encryption key(s) from KeePassXC settings. + Successfully removed %n encryption key(s) from KeePassXC settings. + Forget all site-specific settings on entries @@ -1139,7 +1107,10 @@ Permissions to access entries will be revoked. Successfully removed permissions from %n entry(s). - Successfully removed permissions from %n entry(s).Successfully removed permissions from %n entry(s). + + Successfully removed permissions from %n entry(s). + Successfully removed permissions from %n entry(s). + KeePassXC: No entry with permissions found! @@ -1284,22 +1255,34 @@ If you keep this number, your database may be too easy to crack! MiB Abbreviation for Mebibytes (KDF settings) - MiB MiB + + MiB + MiB + thread(s) Threads for parallel execution (KDF settings) - thread(s) thread(s) + + thread(s) + thread(s) + %1 ms milliseconds - %1 ms%1 ms + + %1 ms + %1 ms + %1 s seconds - %1 s%1 s + + %1 s + %1 s + @@ -1519,7 +1502,10 @@ This is definitely a bug, please report it to the developers. Do you really want to move %n entry(s) to the recycle bin? - Do you really want to move %n entry(s) to the recycle bin?Do you really want to move %n entry(s) to the recycle bin? + + Do you really want to move %n entry(s) to the recycle bin? + Do you really want to move %n entry(s) to the recycle bin? + Execute command? @@ -1581,15 +1567,24 @@ Do you want to merge your changes? Do you really want to delete %n entry(s) for good? - Do you really want to delete %n entry(s) for good?Do you really want to delete %n entry(s) for good? + + Do you really want to delete %n entry(s) for good? + Do you really want to delete %n entry(s) for good? + Delete entry(s)? - Delete entry(s)?Delete entry(s)? + + Delete entry(s)? + Delete entry(s)? + Move entry(s) to recycle bin? - Move entry(s) to recycle bin?Move entry(s) to recycle bin? + + Move entry(s) to recycle bin? + Move entry(s) to recycle bin? + File opened in read only mode. @@ -1659,7 +1654,10 @@ Disable safe saves and try again? Entry "%1" has %2 reference(s). Do you want to overwrite references with values, skip this entry, or delete anyway? - Entry "%1" has %2 reference(s). Do you want to overwrite references with values, skip this entry, or delete anyway?Entry "%1" has %2 reference(s). Do you want to overwrite references with values, skip this entry, or delete anyway? + + Entry "%1" has %2 reference(s). Do you want to overwrite references with values, skip this entry, or delete anyway? + Entry "%1" has %2 reference(s). Do you want to overwrite references with values, skip this entry, or delete anyway? + Delete group @@ -1681,6 +1679,10 @@ Disable safe saves and try again? Database was not modified by merge operation. Database was not modified by merge operation. + + Shared group... + + EditEntryWidget @@ -1762,11 +1764,17 @@ Disable safe saves and try again? %n week(s) - %n week(s)%n week(s) + + %n week(s) + %n week(s) + %n month(s) - %n month(s)%n month(s) + + %n month(s) + %n month(s) + Apply generated password? @@ -1794,7 +1802,10 @@ Disable safe saves and try again? %n year(s) - %n year(s)%n year(s) + + %n year(s) + %n year(s) + Confirm Removal @@ -2118,6 +2129,22 @@ Disable safe saves and try again? Select import/export file Select import/export file + + Clear + Clear + + + The export container %1 is already referenced. + + + + The import container %1 is already imported. + + + + The container %1 imported and export by different groups. + + EditGroupWidgetMain @@ -2206,7 +2233,10 @@ Disable safe saves and try again? Successfully loaded %1 of %n icon(s) - Successfully loaded %1 of %n icon(s)Successfully loaded %1 of %n icon(s) + + Successfully loaded %1 of %n icon(s) + Successfully loaded %1 of %n icon(s) + No icons were loaded @@ -2214,15 +2244,24 @@ Disable safe saves and try again? %n icon(s) already exist in the database - %n icon(s) already exist in the database%n icon(s) already exist in the database + + %n icon(s) already exist in the database + %n icon(s) already exist in the database + The following icon(s) failed: - The following icon(s) failed:The following icon(s) failed: + + The following icon(s) failed: + The following icon(s) failed: + This icon is used by %n entry(s), and will be replaced by the default icon. Are you sure you want to delete it? - This icon is used by %n entry(s), and will be replaced by the default icon. Are you sure you want to delete it?This icon is used by %n entry(s), and will be replaced by the default icon. Are you sure you want to delete it? + + This icon is used by %n entry(s), and will be replaced by the default icon. Are you sure you want to delete it? + This icon is used by %n entry(s), and will be replaced by the default icon. Are you sure you want to delete it? + @@ -2316,7 +2355,10 @@ This may cause the affected plugins to malfunction. Are you sure you want to remove %n attachment(s)? - Are you sure you want to remove %n attachment(s)?Are you sure you want to remove %n attachment(s)? + + Are you sure you want to remove %n attachment(s)? + Are you sure you want to remove %n attachment(s)? + Save attachments @@ -2361,9 +2403,12 @@ This may cause the affected plugins to malfunction. Unable to open file(s): %1 - Unable to open file(s): -%1Unable to open file(s): -%1 + + Unable to open file(s): +%1 + Unable to open file(s): +%1 + @@ -2591,14 +2636,6 @@ This may cause the affected plugins to malfunction. [empty] - - GroupModel - - %1 - Template for name without annotation - %1 - - HostInstaller @@ -2856,7 +2893,7 @@ This may cause the affected plugins to malfunction. The selected file is an old KeePass 1 database (.kdb). -You can import it by clicking on Database > 'Import KeePass 1 database...'. +You can import it by clicking on Database > 'Import KeePass 1 database...'. This is a one-way migration. You won't be able to open the imported database with the old KeePassX 0.4 version. The selected file is an old KeePass 1 database (.kdb). @@ -3193,6 +3230,22 @@ Line %2, column %3 Synchronize with Synchronize with + + Disabled share %1 + + + + Import from share %1 + + + + Export to share %1 + + + + Synchronize with share %1 + + KeyComponentWidget @@ -3266,7 +3319,7 @@ unsupported in the future. Please go to the master key settings and generate a new key file. - Error loading the key file '%1' + Error loading the key file '%1' Message: %2 Error loading the key file '%1' Message: %2 @@ -3843,10 +3896,6 @@ Expect some bugs and minor issues, this version is not meant for production use. <p>A password is the primary method for securing your database.</p><p>Good passwords are long and unique. KeePassXC can generate one for you.</p> <p>A password is the primary method for securing your database.</p><p>Good passwords are long and unique. KeePassXC can generate one for you.</p> - - Password cannot be empty. - Password cannot be empty. - Passwords do not match. Passwords do not match. @@ -4492,7 +4541,10 @@ Available commands: Clearing the clipboard in %1 second(s)... - Clearing the clipboard in %1 second(s)...Clearing the clipboard in %1 second(s)... + + Clearing the clipboard in %1 second(s)... + Clearing the clipboard in %1 second(s)... + Clipboard cleared! @@ -4883,6 +4935,10 @@ Available commands: Database password: Database password: + + Cannot create new group + + QtIOCompressor @@ -5156,9 +5212,8 @@ Available commands: The exported certificate is not the same as the one in use. Do you want to export the current certificate? - %1.%2 - Template for KeeShare key file - %1.%2 + Signer: + @@ -5175,10 +5230,6 @@ Available commands: Import from container with certificate Import from container with certificate - - Do you want to trust %1 with the fingerprint of %2 from %3 - Do you want to trust %1 with the fingerprint of %2 from %3 - Not this time Not this time @@ -5255,14 +5306,6 @@ Available commands: Could not write export container (%1) Could not write export container (%1) - - Could not embed signature (%1) - Could not embed signature (%1) - - - Could not embed database (%1) - Could not embed database (%1) - Overwriting unsigned share container is not supported - export prevented Overwriting unsigned share container is not supported - export prevented @@ -5287,6 +5330,34 @@ Available commands: Export to %1 Export to %1 + + Do you want to trust %1 with the fingerprint of %2 from %3? + Do you want to trust %1 with the fingerprint of %2 from %3? {1 ?} {2 ?} + + + Multiple import source path to %1 in %2 + + + + Conflicting export target path %1 in %2 + + + + Could not embed signature: Could not open file to write (%1) + + + + Could not embed signature: Could not write file (%1) + + + + Could not embed database: Could not open file to write (%1) + + + + Could not embed database: Could not write file (%1) + + TotpDialog @@ -5304,7 +5375,10 @@ Available commands: Expires in <b>%n</b> second(s) - Expires in <b>%n</b> second(s)Expires in <b>%n</b> second(s) + + Expires in <b>%n</b> second(s) + Expires in <b>%n</b> second(s) + @@ -5484,4 +5558,4 @@ Available commands: No YubiKey inserted. - \ No newline at end of file + diff --git a/src/browser/BrowserOptionDialog.cpp b/src/browser/BrowserOptionDialog.cpp index 0d6609cda..dd91f1594 100644 --- a/src/browser/BrowserOptionDialog.cpp +++ b/src/browser/BrowserOptionDialog.cpp @@ -44,7 +44,7 @@ BrowserOptionDialog::BrowserOptionDialog(QWidget* parent) m_ui->extensionLabel->setOpenExternalLinks(true); m_ui->extensionLabel->setText( - tr("KeePassXC-Browser is needed for the browser integration to work.
Download it for %1 and %2.%3") + tr("KeePassXC-Browser is needed for the browser integration to work.
Download it for %1 and %2. %3") .arg("Firefox", "" "Google Chrome / Chromium / Vivaldi", diff --git a/src/gui/group/GroupModel.cpp b/src/gui/group/GroupModel.cpp index 165eaa4a0..dae9f759a 100644 --- a/src/gui/group/GroupModel.cpp +++ b/src/gui/group/GroupModel.cpp @@ -124,7 +124,7 @@ QVariant GroupModel::data(const QModelIndex& index, int role) const Group* group = groupFromIndex(index); if (role == Qt::DisplayRole) { - QString nameTemplate = tr("%1", "Template for name without annotation"); + QString nameTemplate = "%1"; #if defined(WITH_XC_KEESHARE) nameTemplate = KeeShare::indicatorSuffix(group, nameTemplate); #endif diff --git a/src/keeshare/SettingsWidgetKeeShare.cpp b/src/keeshare/SettingsWidgetKeeShare.cpp index efba0eb95..c58e6dc90 100644 --- a/src/keeshare/SettingsWidgetKeeShare.cpp +++ b/src/keeshare/SettingsWidgetKeeShare.cpp @@ -183,7 +183,7 @@ void SettingsWidgetKeeShare::exportCertificate() } const auto filetype = tr("key.share", "Filetype for KeeShare key"); const auto filters = QString("%1 (*." + filetype + ");;%2 (*)").arg(tr("KeeShare key file"), tr("All files")); - QString filename = tr("%1.%2", "Template for KeeShare key file").arg(m_own.certificate.signer).arg(filetype); + QString filename = QString("%1.%2").arg(m_own.certificate.signer).arg(filetype); filename = fileDialog()->getSaveFileName( this, tr("Select path"), defaultDirPath, filters, nullptr, QFileDialog::Options(0), filetype, filename); if (filename.isEmpty()) {