Merge translation files from master branch.

1 files changed, 55 insertions, 55 deletions

diff --git a/tde-i18n-zh_CN/messages/tdeutils/kgpg.po b/tde-i18n-zh_CN/messages/tdeutils/kgpg.po
index a8b604c3ca9..d97996532af 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kgpg.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kgpg.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kgpg\n"
-"POT-Creation-Date: 2019-01-13 18:51+0100\n"
+"POT-Creation-Date: 2019-01-23 23:21+0100\n"
 "PO-Revision-Date: 2005-08-04 04:22+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -226,98 +226,98 @@ msgstr ""
 msgid "Public Key"
 msgstr "公钥"
 
-#: keyservers.cpp:789 kgpginterface.cpp:1578
+#: keyservers.cpp:789 kgpginterface.cpp:1577
 #, c-format
 msgid ""
 "_n: <qt>%n key processed.<br></qt>\n"
 "<qt>%n keys processed.<br></qt>"
 msgstr ""
 
-#: keyservers.cpp:791 kgpginterface.cpp:1580
+#: keyservers.cpp:791 kgpginterface.cpp:1579
 #, c-format
 msgid ""
 "_n: <qt>One key unchanged.<br></qt>\n"
 "<qt>%n keys unchanged.<br></qt>"
 msgstr ""
 
-#: keyservers.cpp:793 kgpginterface.cpp:1582
+#: keyservers.cpp:793 kgpginterface.cpp:1581
 #, c-format
 msgid ""
 "_n: <qt>One signature imported.<br></qt>\n"
 "<qt>%n signatures imported.<br></qt>"
 msgstr ""
 
-#: keyservers.cpp:795 kgpginterface.cpp:1584
+#: keyservers.cpp:795 kgpginterface.cpp:1583
 #, c-format
 msgid ""
 "_n: <qt>One key without ID.<br></qt>\n"
 "<qt>%n keys without ID.<br></qt>"
 msgstr ""
 
-#: keyservers.cpp:797 kgpginterface.cpp:1586
+#: keyservers.cpp:797 kgpginterface.cpp:1585
 #, c-format
 msgid ""
 "_n: <qt>One RSA key imported.<br></qt>\n"
 "<qt>%n RSA keys imported.<br></qt>"
 msgstr ""
 
-#: keyservers.cpp:799 kgpginterface.cpp:1588
+#: keyservers.cpp:799 kgpginterface.cpp:1587
 #, c-format
 msgid ""
 "_n: <qt>One user ID imported.<br></qt>\n"
 "<qt>%n user IDs imported.<br></qt>"
 msgstr ""
 
-#: keyservers.cpp:801 kgpginterface.cpp:1590
+#: keyservers.cpp:801 kgpginterface.cpp:1589
 #, c-format
 msgid ""
 "_n: <qt>One subkey imported.<br></qt>\n"
 "<qt>%n subkeys imported.<br></qt>"
 msgstr ""
 
-#: keyservers.cpp:803 kgpginterface.cpp:1592
+#: keyservers.cpp:803 kgpginterface.cpp:1591
 #, c-format
 msgid ""
 "_n: <qt>One revocation certificate imported.<br></qt>\n"
 "<qt>%n revocation certificates imported.<br></qt>"
 msgstr ""
 
-#: keyservers.cpp:805 kgpginterface.cpp:1595
+#: keyservers.cpp:805 kgpginterface.cpp:1594
 #, c-format
 msgid ""
 "_n: <qt>One secret key processed.<br></qt>\n"
 "<qt>%n secret keys processed.<br></qt>"
 msgstr ""
 
-#: keyservers.cpp:807 kgpginterface.cpp:1599
+#: keyservers.cpp:807 kgpginterface.cpp:1598
 #, c-format
 msgid ""
 "_n: <qt><b>One secret key imported.</b><br></qt>\n"
 "<qt><b>%n secret keys imported.</b><br></qt>"
 msgstr ""
 
-#: keyservers.cpp:809 kgpginterface.cpp:1601
+#: keyservers.cpp:809 kgpginterface.cpp:1600
 #, c-format
 msgid ""
 "_n: <qt>One secret key unchanged.<br></qt>\n"
 "<qt>%n secret keys unchanged.<br></qt>"
 msgstr ""
 
-#: keyservers.cpp:811 kgpginterface.cpp:1603
+#: keyservers.cpp:811 kgpginterface.cpp:1602
 #, c-format
 msgid ""
 "_n: <qt>One secret key not imported.<br></qt>\n"
 "<qt>%n secret keys not imported.<br></qt>"
 msgstr ""
 
-#: keyservers.cpp:813 kgpginterface.cpp:1605
+#: keyservers.cpp:813 kgpginterface.cpp:1604
 #, c-format
 msgid ""
 "_n: <qt><b>One key imported:</b><br></qt>\n"
 "<qt><b>%n keys imported:</b><br></qt>"
 msgstr ""
 
-#: keyservers.cpp:816 kgpginterface.cpp:1611
+#: keyservers.cpp:816 kgpginterface.cpp:1610
 msgid ""
 "No key imported... \n"
 "Check detailed log for more infos"
@@ -618,8 +618,8 @@ msgstr " 或者 "
 msgid "Enter passphrase for your file (symmetrical encryption):"
 msgstr "为您的文件输入密码句(对称加密)："
 
-#: kgpginterface.cpp:227 kgpginterface.cpp:411 kgpginterface.cpp:530
-#: kgpginterface.cpp:779 kgpginterface.cpp:1438
+#: kgpginterface.cpp:227 kgpginterface.cpp:411 kgpginterface.cpp:529
+#: kgpginterface.cpp:778 kgpginterface.cpp:1437
 msgid "[No user id found]"
 msgstr "[未找到用户 ID]"
 
@@ -627,12 +627,12 @@ msgstr "[未找到用户 ID]"
 msgid "<b>No user id found</b>. Trying all secret keys.<br>"
 msgstr "<b>未找到用户 ID</b>。正在尝试所有私钥。<br>"
 
-#: kgpginterface.cpp:234 kgpginterface.cpp:417 kgpginterface.cpp:534
+#: kgpginterface.cpp:234 kgpginterface.cpp:417 kgpginterface.cpp:533
 msgid "<b>Bad passphrase</b>. You have %1 tries left.<br>"
 msgstr "<b>无效的密码句</b>。您还剩下 %1 次重试机会。<br>"
 
-#: kgpginterface.cpp:236 kgpginterface.cpp:418 kgpginterface.cpp:535
-#: kgpginterface.cpp:784
+#: kgpginterface.cpp:236 kgpginterface.cpp:418 kgpginterface.cpp:534
+#: kgpginterface.cpp:783
 msgid "Enter passphrase for <b>%1</b>"
 msgstr "请输入 <b>%1</b> 的密码句"
 
@@ -644,19 +644,19 @@ msgstr "输入密码句(对称加密)"
 msgid "Bad MDC detected. The encrypted text has been manipulated."
 msgstr ""
 
-#: kgpginterface.cpp:608 kgpginterface.cpp:638 kgpginterface.cpp:841
-#: kgpginterface.cpp:868
+#: kgpginterface.cpp:607 kgpginterface.cpp:637 kgpginterface.cpp:840
+#: kgpginterface.cpp:867
 msgid "No signature found."
 msgstr "未找到签名。"
 
-#: kgpginterface.cpp:626 kgpginterface.cpp:844
+#: kgpginterface.cpp:625 kgpginterface.cpp:843
 #, fuzzy
 msgid "<qt>Good signature from:<br><b>%1</b><br>Key ID: %2</qt>"
 msgstr ""
 "来自 %1 的有效签名\n"
 "密钥 ID：%2"
 
-#: kgpginterface.cpp:630
+#: kgpginterface.cpp:629
 #, fuzzy
 msgid ""
 "<qt><b>Bad signature</b> from:<br>%1<br>Key ID: %2<br><br><b>Text is "
@@ -667,55 +667,55 @@ msgstr ""
 "\n"
 "该文件已损坏！"
 
-#: kgpginterface.cpp:640 kgpginterface.cpp:857
+#: kgpginterface.cpp:639 kgpginterface.cpp:856
 msgid "The signature is valid, but the key is untrusted"
 msgstr ""
 
-#: kgpginterface.cpp:642 kgpginterface.cpp:859
+#: kgpginterface.cpp:641 kgpginterface.cpp:858
 msgid "The signature is valid, and the key is ultimately trusted"
 msgstr ""
 
-#: kgpginterface.cpp:649
+#: kgpginterface.cpp:648
 msgid "MD5 Checksum"
 msgstr "MD5 校验和"
 
-#: kgpginterface.cpp:652
+#: kgpginterface.cpp:651
 msgid "Compare MD5 with Clipboard"
 msgstr "和剪贴板比较 MD5"
 
-#: kgpginterface.cpp:667
+#: kgpginterface.cpp:666
 msgid "MD5 sum for <b>%1</b> is:"
 msgstr "<b>%1</b> 的 MD5 校验和是："
 
-#: kgpginterface.cpp:684
+#: kgpginterface.cpp:683
 msgid "<b>Unknown status</b>"
 msgstr "<b>未知状态</b>"
 
-#: kgpginterface.cpp:713
+#: kgpginterface.cpp:712
 msgid "<b>Correct checksum</b>, file is ok."
 msgstr "<b>校验和正确</b>，文件是好的。"
 
-#: kgpginterface.cpp:718
+#: kgpginterface.cpp:717
 msgid "Clipboard content is not a MD5 sum."
 msgstr "剪贴板内容不是 MD5 校验和。"
 
-#: kgpginterface.cpp:720
+#: kgpginterface.cpp:719
 msgid "<b>Wrong checksum, FILE CORRUPTED</b>"
 msgstr "<b>错误的校验和，文件已损坏</b>"
 
-#: kgpginterface.cpp:757
+#: kgpginterface.cpp:756
 msgid "The signature file %1 was successfully created."
 msgstr "签名文件 %1 已成功创建。"
 
-#: kgpginterface.cpp:759
+#: kgpginterface.cpp:758
 msgid "Bad passphrase, signature was not created."
 msgstr "无效的密码句，未创建签名。"
 
-#: kgpginterface.cpp:783
+#: kgpginterface.cpp:782
 msgid "<b>Bad passphrase</b>. you have %1 tries left.<br>"
 msgstr "<b>无效的密码句</b>。您还剩下 %1 次重试机会。<br>"
 
-#: kgpginterface.cpp:848
+#: kgpginterface.cpp:847
 #, fuzzy
 msgid ""
 "<qt><b>BAD signature</b> from:<br> %1<br>Key id: %2<br><br><b>The file is "
@@ -726,33 +726,33 @@ msgstr ""
 "\n"
 "该文件已损坏！"
 
-#: kgpginterface.cpp:872 kgpgview.cpp:241
+#: kgpginterface.cpp:871 kgpgview.cpp:241
 msgid ""
 "<qt><b>Missing signature:</b><br>Key id: %1<br><br>Do you want to import "
 "this key from a keyserver?</qt>"
 msgstr ""
 
-#: kgpginterface.cpp:873 kgpgview.cpp:242 listkeys.cpp:474
+#: kgpginterface.cpp:872 kgpgview.cpp:242 listkeys.cpp:474
 msgid "Do Not Import"
 msgstr "不导入"
 
-#: kgpginterface.cpp:965 kgpginterface.cpp:1046
+#: kgpginterface.cpp:964 kgpginterface.cpp:1045
 #, fuzzy
 msgid "<qt>%1 Enter passphrase for <b>%2</b>:</qt>"
 msgstr "请输入 <b>%1</b> 的密码句"
 
-#: kgpginterface.cpp:988 kgpginterface.cpp:1067
+#: kgpginterface.cpp:987 kgpginterface.cpp:1066
 #, fuzzy
 msgid "<b>Bad passphrase</b>. Try again.</br>"
 msgstr "无效的密码句，请重试。"
 
-#: kgpginterface.cpp:1091
+#: kgpginterface.cpp:1090
 msgid ""
 "<qt>Signing key <b>%1</b> with key <b>%2</b> failed.<br>Do you want to try "
 "signing the key in console mode?</qt>"
 msgstr ""
 
-#: kgpginterface.cpp:1125
+#: kgpginterface.cpp:1124
 msgid ""
 "This key has more than one user ID.\n"
 "Edit the key manually to delete signature."
@@ -760,34 +760,34 @@ msgstr ""
 "这个密钥含有多个用户 ID。\n"
 "请手工编辑该密钥来删除签名。"
 
-#: kgpginterface.cpp:1274 kgpginterface.cpp:1694 kgpginterface.cpp:1824
-#: kgpginterface.cpp:1902 kgpginterface.cpp:1996
+#: kgpginterface.cpp:1273 kgpginterface.cpp:1693 kgpginterface.cpp:1823
+#: kgpginterface.cpp:1901 kgpginterface.cpp:1995
 #, fuzzy
 msgid "<qt>Enter passphrase for <b>%1</b>:</qt>"
 msgstr "请输入 <b>%1</b> 的密码句："
 
-#: kgpginterface.cpp:1318
+#: kgpginterface.cpp:1317
 msgid ""
 "<qt><b>Changing expiration failed.</b><br>Do you want to try changing the "
 "key expiration in console mode?</qt>"
 msgstr ""
 
-#: kgpginterface.cpp:1433
+#: kgpginterface.cpp:1432
 msgid "<b>Bad passphrase</b>. Try again<br>"
 msgstr "<b>无效的密码句</b>。请重试<br>"
 
-#: kgpginterface.cpp:1443
+#: kgpginterface.cpp:1442
 #, fuzzy
 msgid "<qt>%1 Enter passphrase for <b>%2</b></qt>"
 msgstr "请输入 <b>%1</b> 的密码句"
 
-#: kgpginterface.cpp:1458
+#: kgpginterface.cpp:1457
 msgid ""
 "<qt>Enter new passphrase for <b>%1</b><br>If you forget this passphrase, all "
 "your encrypted files and messages will be lost !<br></qt>"
 msgstr ""
 
-#: kgpginterface.cpp:1607
+#: kgpginterface.cpp:1606
 msgid ""
 "<qt><br><b>You have imported a secret key.</b> <br>Please note that imported "
 "secret keys are not trusted by default.<br>To fully use this secret key for "
@@ -795,19 +795,19 @@ msgid ""
 "its trust to Full or Ultimate.</qt>"
 msgstr ""
 
-#: kgpginterface.cpp:1889
+#: kgpginterface.cpp:1888
 msgid "This image is very large. Use it anyway?"
 msgstr ""
 
-#: kgpginterface.cpp:1889
+#: kgpginterface.cpp:1888
 msgid "Use Anyway"
 msgstr ""
 
-#: kgpginterface.cpp:1889
+#: kgpginterface.cpp:1888
 msgid "Do Not Use"
 msgstr ""
 
-#: kgpginterface.cpp:1955
+#: kgpginterface.cpp:1954
 msgid "Creation of the revocation certificate failed..."
 msgstr ""
 
@@ -1516,7 +1516,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "This passphrase is not secure enough.\n"
-"Minimum length = 5 characters"
+"Minimum length= 5 characters"
 msgstr ""
 "这个密码句不够安全。\n"
 "最小长度为 5 字符"