Skip to content

Commit

Permalink
Correct minor issues in translations
Browse files Browse the repository at this point in the history
  • Loading branch information
@droidmonkey
droidmonkey committed Apr 28, 2024
1 parent cd1aa6e commit 19d4f73
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 82 deletions.
124 changes: 58 additions & 66 deletions share/translations/keepassxc_en.ts
View file
Expand Up @@ -701,10 +701,6 @@
</context>
<context>
<name>AutoTypePlatformX11</name>
<message>
<source>Trying to send invalid keysym.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sequence aborted: Caps Lock is on</source>
<translation type="unfinished"></translation>
Expand All @@ -717,6 +713,10 @@
<source>Unable to get valid keycode for key: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Trying to send invalid keyboard symbol.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AutoTypeSelectDialog</name>
Expand Down Expand Up @@ -2812,10 +2812,6 @@ Would you like to correct it?</source>
</context>
<context>
<name>EditEntryWidgetBrowser</name>
<message>
<source>These settings affect to the entry&apos;s behaviour with the browser extension.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>General</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -2844,10 +2840,6 @@ Would you like to correct it?</source>
<source>Do not use this entry with HTTP Basic Auth</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Additional URL&apos;s</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add</source>
<translation type="unfinished"></translation>
Expand All @@ -2860,6 +2852,14 @@ Would you like to correct it?</source>
<source>Edit</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>These settings affect the entry&apos;s behaviour with the browser extension.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Additional URLs</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditEntryWidgetHistory</name>
Expand Down Expand Up @@ -7211,11 +7211,6 @@ Do you want to overwrite it?</source>
<source>time</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set the key file for the database.
This options is deprecated, use --set-key-file instead.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set the key file for the database.</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -8414,10 +8409,6 @@ Kernel: %3 %4</source>
<source>read password of the database from stdin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Locked databases.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Database failed to lock.</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -8481,15 +8472,12 @@ Kernel: %3 %4</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter Shortcut</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Action</source>
<source>Set the key file for the database.
This option is deprecated, use --set-key-file instead.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shortcuts</source>
<source>Databases have been locked.</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down Expand Up @@ -8576,6 +8564,38 @@ Kernel: %3 %4</source>
<source>Failed to decrypt key data.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Origin is empty or not allowed</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Effective domain is not a valid domain</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Origin and RP ID do not match</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No supported algorithms were provided</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Wait for timer to expire</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown Passkeys error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Challenge is shorter than required minimum length</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>user.id does not match the required length</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Favorite</source>
<comment>Tag for favorite entries</comment>
Expand Down Expand Up @@ -8647,35 +8667,15 @@ Kernel: %3 %4</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Origin is empty or not allowed</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Effective domain is not a valid domain</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Origin and RP ID do not match</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No supported algorithms were provided</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Wait for timer to expire</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown Passkeys error</source>
<source>Enter Shortcut</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Challenge is shorter than required minimum length</source>
<source>Action</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>user.id does not match the required length</source>
<source>Shortcuts</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down Expand Up @@ -9377,26 +9377,10 @@ Kernel: %3 %4</source>
<source>Confirm when passwords are retrieved by clients</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot;
font-family:&apos;-apple-system&apos;,&apos;BlinkMacSystemFont&apos;,&apos;Segoe UI&apos;,&apos;Helvetica&apos;,&apos;Arial&apos;,&apos;sans-serif&apos;,&apos;Apple Color
Emoji&apos;,&apos;Segoe UI Emoji&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;This setting does
not override disabling recycle bin prompts&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Confirm when clients request entry deletion</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This improves compatibility with certain applications
which search for password without unlocking the database first.&lt;/p&gt;&lt;p&gt;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.)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Prompt to unlock database before searching</source>
<translation type="unfinished"></translation>
Expand All @@ -9421,6 +9405,14 @@ Kernel: %3 %4</source>
<source>Save current changes to activate the plugin and enable editing of this section.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting does not override disabling recycle bin prompts &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This improves compatibility with certain applications which search for password without unlocking the database first.&lt;/p&gt;&lt;p&gt;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.) &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsWidgetKeeShare</name>
Expand Down
2 changes: 1 addition & 1 deletion src/autotype/xcb/AutoTypeXCB.cpp
View file
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/cli/DatabaseCreate.cpp
View file
Expand Up @@ -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 =
Expand Down
12 changes: 2 additions & 10 deletions src/fdosecrets/widgets/SettingsWidgetFdoSecrets.ui
View file
Expand Up @@ -72,11 +72,7 @@
<item>
<widget class="QCheckBox" name="confirmDeleteItem">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot;
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;&quot;&gt;This setting does
not override disabling recycle bin prompts&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting does not override disabling recycle bin prompts &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Confirm when clients request entry deletion</string>
Expand All @@ -89,11 +85,7 @@
<item>
<widget class="QCheckBox" name="unlockBeforeSearch">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This improves compatibility with certain applications
which search for password without unlocking the database first.&lt;/p&gt;&lt;p&gt;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.)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This improves compatibility with certain applications which search for password without unlocking the database first.&lt;/p&gt;&lt;p&gt;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.) &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Prompt to unlock database before searching</string>
Expand Down
6 changes: 3 additions & 3 deletions src/gui/entry/EditEntryWidgetBrowser.ui
View file
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<width>374</width>
<height>348</height>
</rect>
</property>
Expand All @@ -26,7 +26,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>These settings affect to the entry's behaviour with the browser extension.</string>
<string>These settings affect the entry's behaviour with the browser extension.</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -86,7 +86,7 @@
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Additional URL's</string>
<string>Additional URLs</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_1">
<item>
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
View file
Expand Up @@ -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;
Expand Down

0 comments on commit 19d4f73

Please sign in to comment.