Merge translation files from master branch.

2 files changed, 33 insertions, 32 deletions

diff --git a/tde-i18n-zh_TW/messages/tdeutils/kcmlirc.po b/tde-i18n-zh_TW/messages/tdeutils/kcmlirc.po
index bcdcad3ab3a..a762d2707f2 100644
--- a/tde-i18n-zh_TW/messages/tdeutils/kcmlirc.po
+++ b/tde-i18n-zh_TW/messages/tdeutils/kcmlirc.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmlirc\n"
-"POT-Creation-Date: 2020-05-11 04:05+0200\n"
+"POT-Creation-Date: 2022-09-19 18:20+0000\n"
 "PO-Revision-Date: 2006-02-13 11:12+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -590,27 +590,27 @@ msgstr "備註"
 msgid "Auto-Populate..."
 msgstr "自動分配..."
 
-#: kcmlircbase.ui:356
+#: kcmlircbase.ui:353
 #, no-c-format
 msgid "A&dd..."
 msgstr "新增(&D)..."
 
-#: kcmlircbase.ui:367
+#: kcmlircbase.ui:364
 #, no-c-format
 msgid "Ed&it..."
 msgstr "編輯(&I)..."
 
-#: kcmlircbase.ui:378
+#: kcmlircbase.ui:375
 #, no-c-format
 msgid "Re&move"
 msgstr "移除(&M)"
 
-#: kcmlircbase.ui:395
+#: kcmlircbase.ui:392
 #, no-c-format
 msgid "Loaded Extensions"
 msgstr "載入的延伸程式"
 
-#: kcmlircbase.ui:411 kcmlircbase.ui:452
+#: kcmlircbase.ui:408 kcmlircbase.ui:449
 #, no-c-format
 msgid "Name"
 msgstr "名稱"
diff --git a/tde-i18n-zh_TW/messages/tdeutils/kgpg.po b/tde-i18n-zh_TW/messages/tdeutils/kgpg.po
index 80d4e4b2fd3..7a0b6a280f5 100644
--- a/tde-i18n-zh_TW/messages/tdeutils/kgpg.po
+++ b/tde-i18n-zh_TW/messages/tdeutils/kgpg.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kgpg\n"
-"POT-Creation-Date: 2020-05-18 01:20+0200\n"
+"POT-Creation-Date: 2022-09-19 20:20+0000\n"
 "PO-Revision-Date: 2006-02-10 12:45+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -1714,17 +1714,17 @@ msgstr "選擇公開金鑰"
 msgid "Select Public Key for %1"
 msgstr "選擇 %1 的公開金鑰"
 
-#: conf_encryption.ui:52 popuppublic.cpp:156
+#: conf_encryption.ui:49 popuppublic.cpp:156
 #, no-c-format
 msgid "ASCII armored encryption"
 msgstr "ASCII 裝甲加密"
 
-#: conf_encryption.ui:88 popuppublic.cpp:157
+#: conf_encryption.ui:85 popuppublic.cpp:157
 #, no-c-format
 msgid "Allow encryption with untrusted keys"
 msgstr "允許以不信任的金鑰加密"
 
-#: conf_encryption.ui:64 popuppublic.cpp:158
+#: conf_encryption.ui:61 popuppublic.cpp:158
 #, no-c-format
 msgid "Hide user id"
 msgstr "隱藏使用者 id"
@@ -1762,7 +1762,7 @@ msgstr ""
 "為了讓它變成「信任的」而簽署它，否則您不能使用它。核取此方塊讓您可以使用任何"
 "金鑰，即使它尚未被簽署。"
 
-#: conf_encryption.ui:76 popuppublic.cpp:178
+#: conf_encryption.ui:73 popuppublic.cpp:178
 #, no-c-format
 msgid "Shred source file"
 msgstr "撕碎來源檔案"
@@ -1840,17 +1840,12 @@ msgstr ""
 "\t\t</qt>"
 
 #: conf_encryption.ui:31
-#, no-c-format
-msgid "PGP 6 compatibility"
+#, fuzzy, no-c-format
+msgid "PGP &6 compatibility"
 msgstr "PGP 6 相容性"
 
 #: conf_encryption.ui:34
 #, no-c-format
-msgid "Alt+6"
-msgstr "Alt+6"
-
-#: conf_encryption.ui:37
-#, no-c-format
 msgid ""
 "<qt><b>PGP 6 compatibility:</b><br /> \n"
 "\t\t<p>Checking this option forces GnuPG to output encrypted packets that "
@@ -1861,7 +1856,7 @@ msgstr ""
 "\t\t<p>核取這個選項會強迫 GnuPG 儘可能輸出與 PGP (Pretty Good Privacy) 6 標準"
 "相容的加密封包，這樣可以使 GnuPG 使用者與 PGP 6 使用者交流。</p></qt>"
 
-#: conf_encryption.ui:55
+#: conf_encryption.ui:52
 #, no-c-format
 msgid ""
 "<qt><b>ASCII armored encryption:</b> <br /> \n"
@@ -1873,7 +1868,7 @@ msgstr ""
 "\t\t<p>核取這個選項會把所有加密的檔案輸出為一種可以被文字編輯器開啟的格式，而"
 "這種格式很適合放在電子郵件訊息的主體中。</p></qt>"
 
-#: conf_encryption.ui:67
+#: conf_encryption.ui:64
 #, no-c-format
 msgid ""
 "<qt><b>Hide user ID:</b><br /> \n"
@@ -1890,7 +1885,7 @@ msgstr ""
 "金鑰才能解密這個封包。依據收件者所持有的私密金鑰數量，這可能是一個很長的過"
 "程。</p></qt>"
 
-#: conf_encryption.ui:79
+#: conf_encryption.ui:76
 #, no-c-format
 msgid ""
 "<qt><b>Shred source file:</b><br /> \n"
@@ -1909,7 +1904,7 @@ msgstr ""
 "您先前在編輯器中開啟它或嘗試列印它。這只對檔案有效（不適用於資料夾）。</p></"
 "qt>"
 
-#: conf_encryption.ui:91
+#: conf_encryption.ui:88
 #, no-c-format
 msgid ""
 "<qt><b>Allow encryption with untrusted keys:</b> <br />\n"
@@ -1923,12 +1918,12 @@ msgstr ""
 "的」而使用預設金鑰簽署它，否則您不能使用它。核取此方塊讓您可以使用任何金鑰，"
 "即使它尚未被簽署。</p></qt>"
 
-#: conf_encryption.ui:133
+#: conf_encryption.ui:130
 #, no-c-format
 msgid "Custom encryption command:"
 msgstr "自訂加密指令:"
 
-#: conf_encryption.ui:136
+#: conf_encryption.ui:133
 #, no-c-format
 msgid ""
 "<qt><b>Custom encryption command:</b> <br />\n"
@@ -1940,12 +1935,12 @@ msgstr ""
 "\t\t\t<p>當啟用時，一個項目欄位會顯示在金鑰選擇對話盒，讓您可以輸入自訂的加密"
 "指令。這個選項只建議有經驗的使用者使用。</p></qt>"
 
-#: conf_encryption.ui:163
+#: conf_encryption.ui:160
 #, no-c-format
 msgid "Use *.pgp extension for encrypted files"
 msgstr "加密的檔案使用 *.pgp 延伸檔名"
 
-#: conf_encryption.ui:166
+#: conf_encryption.ui:163
 #, no-c-format
 msgid ""
 "<qt><b>Use *.pgp extension for encrypted files:</b><br />\n"
@@ -1957,12 +1952,12 @@ msgstr ""
 "\t\t<p>核取這個選項會在所有加密檔案後面加入 .pgp 延伸檔名取代 .gpg 延伸檔名。"
 "這個選項會維持與 PGP (Pretty Good Privacy) 軟體使用者的相容性。</p></qt>"
 
-#: conf_encryption.ui:175
+#: conf_encryption.ui:172
 #, no-c-format
 msgid "Encrypt files with:"
 msgstr "以此加密檔案:"
 
-#: conf_encryption.ui:192
+#: conf_encryption.ui:189
 #, no-c-format
 msgid ""
 "<qt><b>Encrypt files with:</b><br /> \n"
@@ -1974,22 +1969,22 @@ msgstr ""
 "<p>核取這個選項並且選擇一個金鑰將會強迫任何檔案加密操作都使用這個金鑰。KGpg "
 "將不會詢問收件者同時會略過預設金鑰。</p></qt>"
 
-#: conf_encryption.ui:209 conf_encryption.ui:283
+#: conf_encryption.ui:206 conf_encryption.ui:280
 #, no-c-format
 msgid "..."
 msgstr "..."
 
-#: conf_encryption.ui:225 conf_encryption.ui:267 conf_gpg.ui:76
+#: conf_encryption.ui:222 conf_encryption.ui:264 conf_gpg.ui:76
 #, no-c-format
 msgid "Change..."
 msgstr "變更..."
 
-#: conf_encryption.ui:233
+#: conf_encryption.ui:230
 #, no-c-format
 msgid "Always encrypt with:"
 msgstr "永遠以此加密:"
 
-#: conf_encryption.ui:250
+#: conf_encryption.ui:247
 #, no-c-format
 msgid ""
 "<qt><b>Always encrypt with:</b><br /> \n"
@@ -3047,6 +3042,9 @@ msgstr ""
 #~ "這個密語不夠安全。\n"
 #~ "最小長度 = 5 字元"
 
+#~ msgid "Alt+6"
+#~ msgstr "Alt+6"
+
 #, fuzzy
 #~ msgid "Untitled"
 #~ msgstr "未命名"
@@ -3069,3 +3067,6 @@ msgstr ""
 
 #~ msgid "&Unicode (utf-8) Encoding"
 #~ msgstr "&Unicode (utf-8) 編輯"
+
+#~ msgid "PGP 6 compatibility"
+#~ msgstr "PGP 6 相容性"