Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated English translation file and fixed typos in HTTP language

Browse Source
This commit is contained in:
Jonathan White 2016-11-14 21:54:56 -05:00
parent 9bb2cfcd51
commit 29f93597f2
No known key found for this signature in database
GPG Key ID: 506BDC439519BC13
4 changed files with 283 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

476
share/translations/keepassx_en.ts
View File

@ -3,14 +3,6 @@
<TS version="2.1" language="en_US"> <TS version="2.1" language="en_US">
<context> <context>
<name>AboutDialog</name> <name>AboutDialog</name>
<message>
<source>About KeePassX</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Revision</source> <source>Revision</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -19,13 +11,17 @@
<source>Using:</source> <source>Using:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>About KeePassXC</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeePassXC is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>AccessControlDialog</name> <name>AccessControlDialog</name>
<message>
<source>KeyPassX/Http: Confirm Access</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Remember this decision</source> <source>Remember this decision</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -43,15 +39,19 @@
Please select whether you want to allow access.</source> Please select whether you want to allow access.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>KeePassXC HTTP Confirm Access</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>AutoType</name> <name>AutoType</name>
<message> <message>
<source>Auto-Type - KeePassX</source> <source>Couldn&apos;t find an entry that matches the window title:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Couldn&apos;t find an entry that matches the window title:</source> <source>Auto-Type - KeePassXC</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -73,11 +73,11 @@ Please select whether you want to allow access.</source>
<context> <context>
<name>AutoTypeSelectDialog</name> <name>AutoTypeSelectDialog</name>
<message> <message>
<source>Auto-Type - KeePassX</source> <source>Select entry to Auto-Type:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Select entry to Auto-Type:</source> <source>Auto-Type - KeePassXC</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -342,11 +342,6 @@ Save changes?</source>
<source>locked</source> <source>locked</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>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.</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Lock database</source> <source>Lock database</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -385,12 +380,21 @@ Discard changes and close anyway?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>The database you are trying to save as is locked by another instance of KeePassX. <source>Unable to open the database.</source>
Do you want to save it anyway?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Unable to open the database.</source> <source>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.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Merge database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The database you are trying to save as is locked by another instance of KeePassXC.
Do you want to save it anyway?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -451,6 +455,26 @@ Do you want to save it anyway?</source>
<source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source> <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Searching...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No current database.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No source database, nothing to do.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search Results (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No Results</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidget</name> <name>EditEntryWidget</name>
@ -992,7 +1016,7 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>KeePassX - Error</source> <source>KeePassXC - Error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -1002,102 +1026,14 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
<source>Database</source> <source>Database</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Recent databases</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Entries</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Copy attribute to clipboard</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Groups</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>View</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Open database</source> <source>Open database</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Save database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Close database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>New database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add new entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>View/Edit entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delete entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add new group</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Edit group</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delete group</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save database as</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Change master key</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Database settings</source> <source>Database settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Import KeePass 1 database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Clone entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Find</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Copy username to clipboard</source> <source>Copy username to clipboard</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -1110,30 +1046,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
<source>Settings</source> <source>Settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Perform Auto-Type</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Lock databases</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Show toolbar</source> <source>Show toolbar</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -1150,22 +1062,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
<source>Tools</source> <source>Tools</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Copy username</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Copy password</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Export to CSV file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Repair database</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>KeePass 2 Database</source> <source>KeePass 2 Database</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -1186,6 +1082,150 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
<source>Writing the database failed.</source> <source>Writing the database failed.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>&amp;Recent databases</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>He&amp;lp</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>E&amp;ntries</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Copy att&amp;ribute to clipboard</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Groups</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;View</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;About</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Open database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Save database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Close database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;New database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Merge from KeePassX database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Add new entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;View/Edit entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Delete entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Add new group</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Edit group</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Delete group</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sa&amp;ve database as</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Change &amp;master key</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Database settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Import KeePass 1 database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Clone entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Find</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Copy &amp;username</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cop&amp;y password</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Perform Auto-Type</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Open URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Lock databases</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Notes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Export to CSV file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Re&amp;pair database</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>OptionDialog</name> <name>OptionDialog</name>
@ -1193,11 +1233,6 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
<source>Dialog</source> <source>Dialog</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Support KeypassHttp protocol
This is required for accessing keypass database from ChromeIPass or PassIfox</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>General</source> <source>General</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -1211,10 +1246,6 @@ This is required for accessing keypass database from ChromeIPass or PassIfox</so
of all entries for the whole domain</source> of all entries for the whole domain</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Re&amp;quest for unlocking the database if it is locked</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>&amp;Match URL schemes <source>&amp;Match URL schemes
Only entries with the same scheme (http://, https://, ftp://, ...) are returned</source> Only entries with the same scheme (http://, https://, ftp://, ...) are returned</source>
@ -1224,10 +1255,6 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
<source>Sort matching entries by &amp;username</source> <source>Sort matching entries by &amp;username</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Sort matching entries by &amp;title</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>R&amp;emove all shared encryption-keys from active database</source> <source>R&amp;emove all shared encryption-keys from active database</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -1288,6 +1315,19 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
<source>Default port: 19455</source> <source>Default port: 19455</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Enable KeepassXC Http protocol
This is required for accessing your databases from ChromeIPass or PassIFox</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Re&amp;quest to unlock the database if it is locked</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sort &amp;matching entries by title</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PasswordGeneratorWidget</name> <name>PasswordGeneratorWidget</name>
@ -1379,65 +1419,39 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
<source>Find:</source> <source>Find:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Case Sensitive</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search Current Group</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>Service</name> <name>Service</name>
<message>
<source>KeyPassX/Http: New key association request</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>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.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeyPassX/Http: Overwrite existing key?</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>A shared encryption-key with the name &quot;%1&quot; already exists. <source>A shared encryption-key with the name &quot;%1&quot; already exists.
Do you want to overwrite it?</source> Do you want to overwrite it?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>KeyPassX/Http: Update Entry</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Do you want to update the information in %1 - %2?</source> <source>Do you want to update the information in %1 - %2?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>KeyPassX/Http: Database locked!</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>The active database is locked! <source>The active database is locked!
Please unlock the selected database or choose another one which is unlocked.</source> Please unlock the selected database or choose another one which is unlocked.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>KeyPassX/Http: Removed keys from database</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source> <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>KeyPassX/Http: No keys found</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>No shared encryption-keys found in KeePassHttp Settings.</source> <source>No shared encryption-keys found in KeePassHttp Settings.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>KeyPassX/Http: Settings not available!</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>The active database does not contain an entry of KeePassHttp Settings.</source> <source>The active database does not contain an entry of KeePassHttp Settings.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -1450,20 +1464,54 @@ Please unlock the selected database or choose another one which is unlocked.</so
<source>Abort</source> <source>Abort</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>KeyPassX/Http: Removed permissions</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Successfully removed permissions from %1 %2.</source> <source>Successfully removed permissions from %1 %2.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>KeyPassX/Http: No entry with permissions found!</source> <source>The active database does not contain an entry with permissions.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>The active database does not contain an entry with permissions.</source> <source>KeePassXC: New key association request</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>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.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeePassXC: Overwrite existing key?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeePassXC: Update Entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeePassXC: Database locked!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeePassXC: Removed keys from database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeePassXC: No keys found</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeePassXC: Settings not available!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeePassXC: Removed permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeePassXC: No entry with permissions found!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
@ -1563,6 +1611,10 @@ Please unlock the selected database or choose another one which is unlocked.</so
<source>Always ask before performing auto-type</source> <source>Always ask before performing auto-type</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Lock databases after minimizing the window</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>UnlockDatabaseWidget</name> <name>UnlockDatabaseWidget</name>
@ -1580,10 +1632,6 @@ Please unlock the selected database or choose another one which is unlocked.</so
</context> </context>
<context> <context>
<name>main</name> <name>main</name>
<message>
<source>KeePassX - cross-platform password manager</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>path to a custom config file</source> <source>path to a custom config file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -1596,5 +1644,13 @@ Please unlock the selected database or choose another one which is unlocked.</so
<source>filename(s) of the password database(s) to open (*.kdbx)</source> <source>filename(s) of the password database(s) to open (*.kdbx)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>KeePassXC - cross-platform password manager</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>read password of the database from stdin</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

2
src/http/AccessControlDialog.ui
View File

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>KeyPassX/Http: Confirm Access</string> <string>KeePassXC HTTP Confirm Access</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>

12
src/http/OptionDialog.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>531</width> <width>605</width>
<height>354</height> <height>389</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -17,8 +17,8 @@
<item> <item>
<widget class="QCheckBox" name="enableHttpServer"> <widget class="QCheckBox" name="enableHttpServer">
<property name="text"> <property name="text">
<string>Support KeypassHttp protocol <string>Enable KeepassXC Http protocol
This is required for accessing keypass database from ChromeIPass or PassIfox</string> This is required for accessing your databases from ChromeIPass or PassIFox</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -53,7 +53,7 @@ of all entries for the whole domain</string>
<item> <item>
<widget class="QCheckBox" name="unlockDatabase"> <widget class="QCheckBox" name="unlockDatabase">
<property name="text"> <property name="text">
<string>Re&amp;quest for unlocking the database if it is locked</string> <string>Re&amp;quest to unlock the database if it is locked</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -75,7 +75,7 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
<item> <item>
<widget class="QRadioButton" name="sortByTitle"> <widget class="QRadioButton" name="sortByTitle">
<property name="text"> <property name="text">
<string>Sort matching entries by &amp;title</string> <string>Sort &amp;matching entries by title</string>
</property> </property>
</widget> </widget>
</item> </item>

20
src/http/Service.cpp
View File

@ -146,7 +146,7 @@ QString Service::storeKey(const QString &key)
bool ok; bool ok;
//Indicate who wants to associate, and request user to enter the 'name' of association key //Indicate who wants to associate, and request user to enter the 'name' of association key
id = QInputDialog::getText(0, id = QInputDialog::getText(0,
tr("KeyPassX/Http: New key association request"), tr("KeePassXC: New key association request"),
tr("You have received an association " tr("You have received an association "
"request for the above key.\n" "request for the above key.\n"
"If you would like to allow it access " "If you would like to allow it access "
@ -158,7 +158,7 @@ QString Service::storeKey(const QString &key)
//Warn if association key already exists //Warn if association key already exists
} while(config->attributes()->contains(QLatin1String(ASSOCIATE_KEY_PREFIX) + id) && } 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), 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); 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) { if (u != login || entry->password() != password) {
//ShowNotification(QString("%0: You have an entry change prompt waiting, click to activate").arg(requestId)); //ShowNotification(QString("%0: You have an entry change prompt waiting, click to activate").arg(requestId));
if ( HttpSettings::alwaysAllowUpdate() 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), tr("Do you want to update the information in %1 - %2?").arg(QUrl(url).host()).arg(u),
QMessageBox::Yes|QMessageBox::No) == QMessageBox::Yes ) { QMessageBox::Yes|QMessageBox::No) == QMessageBox::Yes ) {
entry->beginUpdate(); entry->beginUpdate();
@ -499,7 +499,7 @@ QString Service::generatePassword()
void Service::removeSharedEncryptionKeys() void Service::removeSharedEncryptionKeys()
{ {
if (!isDatabaseOpened()) { if (!isDatabaseOpened()) {
QMessageBox::critical(0, tr("KeyPassX/Http: Database locked!"), QMessageBox::critical(0, tr("KeePassXC: Database locked!"),
tr("The active database is locked!\n" tr("The active database is locked!\n"
"Please unlock the selected database or choose another one which is unlocked."), "Please unlock the selected database or choose another one which is unlocked."),
QMessageBox::Ok); QMessageBox::Ok);
@ -516,16 +516,16 @@ void Service::removeSharedEncryptionKeys()
entry->endUpdate(); entry->endUpdate();
const int count = keysToRemove.count(); 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"), tr("Successfully removed %1 encryption-%2 from KeePassX/Http Settings.").arg(count).arg(count ? "keys" : "key"),
QMessageBox::Ok); QMessageBox::Ok);
} else { } 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."), tr("No shared encryption-keys found in KeePassHttp Settings."),
QMessageBox::Ok); QMessageBox::Ok);
} }
} else { } 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."), tr("The active database does not contain an entry of KeePassHttp Settings."),
QMessageBox::Ok); QMessageBox::Ok);
} }
@ -534,7 +534,7 @@ void Service::removeSharedEncryptionKeys()
void Service::removeStoredPermissions() void Service::removeStoredPermissions()
{ {
if (!isDatabaseOpened()) { if (!isDatabaseOpened()) {
QMessageBox::critical(0, tr("KeyPassX/Http: Database locked!"), QMessageBox::critical(0, tr("KeePassXC: Database locked!"),
tr("The active database is locked!\n" tr("The active database is locked!\n"
"Please unlock the selected database or choose another one which is unlocked."), "Please unlock the selected database or choose another one which is unlocked."),
QMessageBox::Ok); QMessageBox::Ok);
@ -560,11 +560,11 @@ void Service::removeStoredPermissions()
progress.reset(); progress.reset();
if (counter > 0) { 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"), tr("Successfully removed permissions from %1 %2.").arg(counter).arg(counter ? "entries" : "entry"),
QMessageBox::Ok); QMessageBox::Ok);
} else { } 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."), tr("The active database does not contain an entry with permissions."),
QMessageBox::Ok); QMessageBox::Ok);
} }