Merge branch 'release/2.3.0' into develop

This commit is contained in:
Janek Bevendorff 2018-02-21 22:21:44 +01:00
commit 1b95efd1fa
No known key found for this signature in database
GPG Key ID: 2FDEB0D40BCA5E11
3 changed files with 25 additions and 24 deletions

View File

@ -3518,11 +3518,11 @@ Available commands:
</message>
<message>
<source>Legacy Browser Integration</source>
<translation type="unfinished"/>
<translation>تكامل المتصفح القديم</translation>
</message>
<message>
<source>Browser Integration</source>
<translation type="unfinished"/>
<translation>تكامل المتصفح</translation>
</message>
<message>
<source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
@ -3534,7 +3534,7 @@ Available commands:
</message>
<message>
<source>Passive</source>
<translation type="unfinished"/>
<translation>سلبي</translation>
</message>
<message>
<source>SSH Agent</source>

View File

@ -11,7 +11,7 @@
</message>
<message>
<source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
<translation>Báo cáo lỗi tại: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
<translation>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
</message>
<message>
<source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
@ -19,28 +19,28 @@
</message>
<message>
<source>Contributors</source>
<translation>Người đóng góp</translation>
<translation>Contributors</translation>
</message>
<message>
<source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
<translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Xem Đóng góp tại GitHub&lt;/a&gt;</translation>
<translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</translation>
</message>
<message>
<source>Debug Info</source>
<translation>Thông Tin Sửa Lỗi</translation>
<translation>Debug Info</translation>
</message>
<message>
<source>Include the following information whenever you report a bug:</source>
<translation>Bao gồm những thông tin sau khi bạn báo lỗi:</translation>
<translation>Include the following information whenever you report a bug:</translation>
</message>
<message>
<source>Copy to clipboard</source>
<translation>Sao chép o clipboard</translation>
<translation>Copy to clipboard</translation>
</message>
<message>
<source>Version %1
</source>
<translation>Phiên bản %1
<translation>Version %1
</translation>
</message>
<message>
@ -53,7 +53,7 @@
</message>
<message>
<source>Libraries:</source>
<translation>Thư viện:</translation>
<translation>Libraries:</translation>
</message>
<message>
<source>Operating system: %1
@ -65,7 +65,7 @@ Kernel: %3 %4</translation>
</message>
<message>
<source>Enabled extensions:</source>
<translation>Phần mở rộng đã bật:</translation>
<translation>Enabled extensions:</translation>
</message>
<message>
<source>Project Maintainers:</source>
@ -98,7 +98,7 @@ Kernel: %3 %4</translation>
</message>
<message>
<source>Deny</source>
<translation>Từ chối</translation>
<translation>Deny</translation>
</message>
<message>
<source>%1 has requested access to passwords for the following item(s).

View File

@ -1191,7 +1191,7 @@ Wil je de wijzigingen samenvoegen?</translation>
</message>
<message>
<source>Entry updated successfully.</source>
<translation type="unfinished"/>
<translation>Het item is bijgewerkt.</translation>
</message>
</context>
<context>
@ -1381,15 +1381,15 @@ Wil je de wijzigingen samenvoegen?</translation>
</message>
<message>
<source>Apply generated password?</source>
<translation type="unfinished"/>
<translation>Pas gegenereerde wachtwoord toe?</translation>
</message>
<message>
<source>Do you want to apply the generated password to this entry?</source>
<translation type="unfinished"/>
<translation>Wil je het gegenereerde wachtwoord instellen voor dit item?</translation>
</message>
<message>
<source>Entry updated successfully.</source>
<translation type="unfinished"/>
<translation>Het item is bijgewerkt.</translation>
</message>
</context>
<context>
@ -1424,11 +1424,11 @@ Wil je de wijzigingen samenvoegen?</translation>
</message>
<message>
<source>Foreground Color:</source>
<translation type="unfinished"/>
<translation>Kleur voorgrond:</translation>
</message>
<message>
<source>Background Color:</source>
<translation type="unfinished"/>
<translation>Kleur achtergrond:</translation>
</message>
</context>
<context>
@ -1745,7 +1745,7 @@ Wil je de wijzigingen samenvoegen?</translation>
</message>
<message>
<source>Plugin Data</source>
<translation type="unfinished"/>
<translation>Plugingegevens:</translation>
</message>
<message>
<source>Remove</source>
@ -1753,20 +1753,21 @@ Wil je de wijzigingen samenvoegen?</translation>
</message>
<message>
<source>Delete plugin data?</source>
<translation type="unfinished"/>
<translation>Verwijder plugingegevens?</translation>
</message>
<message>
<source>Do you really want to delete the selected plugin data?
This may cause the affected plugins to malfunction.</source>
<translation type="unfinished"/>
<translation>Wil je echt de geselecteerde plugingegevens verwijderen?
Hierdoor werken de plugins mogelijk niet meer goed.</translation>
</message>
<message>
<source>Key</source>
<translation type="unfinished"/>
<translation>Sleutel</translation>
</message>
<message>
<source>Value</source>
<translation type="unfinished"/>
<translation>Waarde</translation>
</message>
</context>
<context>