Merge translation files from master branch.

2 files changed, 30 insertions, 32 deletions

diff --git a/tde-i18n-hi/messages/tdeutils/kcmlirc.po b/tde-i18n-hi/messages/tdeutils/kcmlirc.po
index e05739a978a..f2ed8ebf7c2 100644
--- a/tde-i18n-hi/messages/tdeutils/kcmlirc.po
+++ b/tde-i18n-hi/messages/tdeutils/kcmlirc.po
@@ -6,7 +6,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: 2004-08-24 13:17+0530\n"
 "Last-Translator: Ravishankar Shrivastava <[email protected]>\n"
 "Language-Team: Hindi <[email protected]>\n"
@@ -597,27 +597,27 @@ msgstr "टीप"
 msgid "Auto-Populate..."
 msgstr ""
 
-#: kcmlircbase.ui:356
+#: kcmlircbase.ui:353
 #, fuzzy, no-c-format
 msgid "A&dd..."
 msgstr "क्रिया जोड़ें... (&d)"
 
-#: kcmlircbase.ui:367
+#: kcmlircbase.ui:364
 #, fuzzy, no-c-format
 msgid "Ed&it..."
 msgstr "क्रिया का संपादन करें... (&E)"
 
-#: kcmlircbase.ui:378
+#: kcmlircbase.ui:375
 #, fuzzy, 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-hi/messages/tdeutils/kgpg.po b/tde-i18n-hi/messages/tdeutils/kgpg.po
index 852f738b718..750ec1bebf0 100644
--- a/tde-i18n-hi/messages/tdeutils/kgpg.po
+++ b/tde-i18n-hi/messages/tdeutils/kgpg.po
@@ -6,7 +6,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: 2004-08-24 10:54+0530\n"
 "Last-Translator: Ravishankar Shrivastava <[email protected]>\n"
 "Language-Team: Hindi <[email protected]>\n"
@@ -1679,17 +1679,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 "उपयोक्ता पहचान छुपाएँ"
@@ -1721,7 +1721,7 @@ msgid ""
 "even if it has not be signed."
 msgstr ""
 
-#: conf_encryption.ui:76 popuppublic.cpp:178
+#: conf_encryption.ui:73 popuppublic.cpp:178
 #, no-c-format
 msgid "Shred source file"
 msgstr "स्रोत फ़ाइल धज्जियाँ करें"
@@ -1788,17 +1788,12 @@ msgid ""
 msgstr ""
 
 #: conf_encryption.ui:31
-#, no-c-format
-msgid "PGP 6 compatibility"
+#, fuzzy, no-c-format
+msgid "PGP &6 compatibility"
 msgstr "पीजीपी६ कॉम्पेटिबिलिटी"
 
 #: conf_encryption.ui:34
 #, no-c-format
-msgid "Alt+6"
-msgstr ""
-
-#: 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 "
@@ -1806,7 +1801,7 @@ msgid ""
 "allowing GnuPG users to inter operate with PGP 6 users.</p></qt>"
 msgstr ""
 
-#: conf_encryption.ui:55
+#: conf_encryption.ui:52
 #, no-c-format
 msgid ""
 "<qt><b>ASCII armored encryption:</b> <br /> \n"
@@ -1815,7 +1810,7 @@ msgid ""
 "the body of an e-mail message.</p></qt>"
 msgstr ""
 
-#: conf_encryption.ui:67
+#: conf_encryption.ui:64
 #, no-c-format
 msgid ""
 "<qt><b>Hide user ID:</b><br /> \n"
@@ -1827,7 +1822,7 @@ msgid ""
 "process depending on the number of secret keys the receiver holds.</p></qt>"
 msgstr ""
 
-#: conf_encryption.ui:79
+#: conf_encryption.ui:76
 #, no-c-format
 msgid ""
 "<qt><b>Shred source file:</b><br /> \n"
@@ -1840,7 +1835,7 @@ msgid ""
 "(not on folders).</p></qt>"
 msgstr ""
 
-#: conf_encryption.ui:91
+#: conf_encryption.ui:88
 #, no-c-format
 msgid ""
 "<qt><b>Allow encryption with untrusted keys:</b> <br />\n"
@@ -1850,12 +1845,12 @@ msgid ""
 "it is untrusted.</p></qt>"
 msgstr ""
 
-#: 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"
@@ -1864,12 +1859,12 @@ msgid ""
 "is recommended for experienced users only.</p></qt>"
 msgstr ""
 
-#: 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"
@@ -1878,12 +1873,12 @@ msgid ""
 "with users of PGP (Pretty Good Privacy) software.</p></qt>"
 msgstr ""
 
-#: 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"
@@ -1892,22 +1887,22 @@ msgid ""
 "the default key will be bypassed.</p></qt>"
 msgstr ""
 
-#: 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
 #, fuzzy, 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"
@@ -2980,3 +2975,6 @@ msgstr ""
 
 #~ msgid "Show the toolbar."
 #~ msgstr "औज़ार पट्टी दिखाएँ."
+
+#~ msgid "PGP 6 compatibility"
+#~ msgstr "पीजीपी६ कॉम्पेटिबिलिटी"