Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-02 19:46:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/2.1.3' into develop

Browse source
This commit is contained in:
Janek Bevendorff 2017-02-22 14:13:58 +01:00
commit a938b7aadb
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
5 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/http/OptionDialog.ui
View file

@ -45,7 +45,7 @@ This is required for accessing your databases from ChromeIPass or PassIFox</stri
<item>
<widget class="QCheckBox" name="bestMatchOnly">
<property name="text">
<string>&amp;Return only best matching entries for an URL instead
<string>&amp;Return only best matching entries for a URL instead
of all entries for the whole domain</string>
</property>
</widget>
@ -82,7 +82,7 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
<item>
<widget class="QPushButton" name="removeSharedEncryptionKeys">
<property name="text">
<string>R&amp;emove all shared encryption-keys from active database</string>
<string>R&amp;emove all shared encryption keys from active database</string>
</property>
</widget>
</item>
@ -148,7 +148,7 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
<string notr="true">color: rgb(255, 0, 0);</string>
</property>
<property name="text">
<string>Activate the following only, if you know what you are doing!</string>
<string>The following options can be dangerous. Change them only if you know what you are doing.</string>
</property>
</widget>
</item>
@ -186,14 +186,14 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
<item>
<widget class="QCheckBox" name="supportKphFields">
<property name="text">
<string>&amp;Return also advanced string fields which start with &quot;KPH: &quot;</string>
<string>&amp;Return advanced string fields which start with &quot;KPH: &quot;</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Automatic creates or updates are not supported for string fields!</string>
<string>Automatically creating or updating string fields is not supported.</string>
</property>
<property name="indent">
<number>30</number>

2
src/main.cpp
View file

@ -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"),