Merge branch 'develop' into fix/settingsAlignment

This commit is contained in:
Janek Bevendorff 2017-02-22 14:15:50 +01:00
commit 0892d1c744
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
5 changed files with 34 additions and 33 deletions

View file

@ -1297,11 +1297,6 @@ This is a one-way migration. You won't be able to open the imported databas
<source>Sh&amp;ow a notification when credentials are requested</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Return only best matching entries for an URL instead
of all entries for the whole domain</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Match URL schemes
Only entries with the same scheme (http://, https://, ftp://, ...) are returned</source>
@ -1311,10 +1306,6 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
<source>Sort matching entries by &amp;username</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>R&amp;emove all shared encryption-keys from active database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Re&amp;move all stored permissions from entries in active database</source>
<translation type="unfinished"></translation>
@ -1327,10 +1318,6 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
<source>Advanced</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Activate the following only, if you know what you are doing!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Always allow &amp;access to entries</source>
<translation type="unfinished"></translation>
@ -1347,14 +1334,6 @@ Only entries with the same scheme (http://, https://, ftp://, ...) are returned<
<source>Only the selected database has to be connected with a client!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Return also advanced string fields which start with &quot;KPH: &quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Automatic creates or updates are not supported for string fields!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>HTTP Port:</source>
<translation type="unfinished"></translation>
@ -1389,6 +1368,27 @@ This is required for accessing your databases from ChromeIPass or PassIFox</sour
Using default port 19455.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Return only best matching entries for a URL instead
of all entries for the whole domain</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>R&amp;emove all shared encryption keys from active database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The following options can be dangerous. Change them only if you know what you are doing.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Automatically creating or updating string fields is not supported.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PasswordGeneratorWidget</name>
@ -1761,10 +1761,6 @@ give it a unique name to identify and accept it.</source>
<source>key file of the database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>filename(s) of the password database(s) to open (*.kdbx)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeePassXC - cross-platform password manager</source>
<translation type="unfinished"></translation>
@ -1773,5 +1769,9 @@ give it a unique name to identify and accept it.</source>
<source>read password of the database from stdin</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>filenames of the password databases to open (*.kdbx)</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>