Merge translation files from master branch.

1 files changed, 42 insertions, 32 deletions

diff --git a/tde-i18n-pa/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-pa/messages/tdebase/kcmcomponentchooser.po
index 784d706314c..4fcdeb2d2d7 100644
--- a/tde-i18n-pa/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-pa/messages/tdebase/kcmcomponentchooser.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\n"
-"POT-Creation-Date: 2020-02-16 23:35+0100\n"
+"POT-Creation-Date: 2020-02-23 20:08+0100\n"
 "PO-Revision-Date: 2007-01-17 22:22+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
@@ -29,28 +29,23 @@ msgid ""
 "Your emails"
 msgstr "aalam@users.sf.net"
 
-#: componentchooser.cpp:165
+#: componentchooser.cpp:166
 msgid "Select preferred email client:"
 msgstr "ਪਸੰਦੀਦਾ ਈ-ਮੇਲ ਕਲਾਂਇਟ ਚੁਣੋ:"
 
-#: componentchooser.cpp:271
-#, fuzzy
-msgid "Select preferred file manager application:"
-msgstr "ਪਸੰਦੀਦਾ ਟਰਮੀਨਲ ਕਾਰਜ ਚੁਣੋ:"
-
-#: componentchooser.cpp:342
+#: componentchooser.cpp:309
 msgid "Select preferred terminal application:"
 msgstr "ਪਸੰਦੀਦਾ ਟਰਮੀਨਲ ਕਾਰਜ ਚੁਣੋ:"
 
-#: componentchooser.cpp:437
+#: componentchooser.cpp:404
 msgid "Select preferred Web browser application:"
 msgstr "ਪਸੰਦੀਦਾ ਵੈੱਬ ਝਲਕਾਰਾ ਕਾਰਜ ਚੁਣੋ:"
 
-#: componentchooser.cpp:462
+#: componentchooser.cpp:429
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: componentchooser.cpp:477
+#: componentchooser.cpp:444
 msgid ""
 "<qt>You changed the default component of your choice. Do you want to save "
 "that change now?</qt>"
@@ -58,11 +53,11 @@ msgstr ""
 "<qt>ਤੁਸੀਂ ਆਪਣੀ ਚੋਣ ਮੁਤਾਬਕ ਮੂਲ ਭਾਗ ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਹੈ। ਕੀ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਨੂੰ ਹੁਣ ਸੰਭਾਲਣਾ "
 "ਚਾਹੁੰਦੇ ਹੋ?</qt>"
 
-#: componentchooser.cpp:481
+#: componentchooser.cpp:448
 msgid "No description available"
 msgstr "ਕੋਈ ਵੇਰਵਾ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
-#: componentchooser.cpp:492 componentchooser.cpp:497
+#: componentchooser.cpp:459 componentchooser.cpp:464
 msgid ""
 "Choose from the list below which component should be used by default for the "
 "%1 service."
@@ -96,7 +91,7 @@ msgid "in the following browser:"
 msgstr "ਇਹ ਝਲਕਾਰਾ:"
 
 #: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
-#: filemanagerconfig_ui.ui:149 terminalemulatorconfig_ui.ui:149
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
@@ -206,28 +201,23 @@ msgstr "ਵੱਖਰਾ ਈ-ਮੇਲ ਕਲਾਂਇਟ ਵਰਤੋਂ(&e):"
 msgid "Select this option if you want to use any other mail program."
 msgstr "ਜੇਕਰ ਤੁਸੀਂ ਹੋਰ ਪੱਤਰ ਪਰੋਗਰਾਮ ਦੀ ਵਰਤੋਂ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਇਹ ਚੋਣ ਕਰੋ।"
 
-#: filemanagerconfig_ui.ui:72
-#, fuzzy, no-c-format
-msgid "Use a different &file manager program:"
-msgstr "ਵੱਖਰਾ ਟਰਮੀਨਲ ਕਾਰਜ ਵਰਤੋਂ(&t):"
-
-#: filemanagerconfig_ui.ui:97
-#, fuzzy, no-c-format
-msgid "&Use Konqueror as file manager application"
-msgstr "ਕੇਨਸੋਲ ਨੂੰ ਟਰਮੀਨਲ ਕਾਰਜ ਦੇ ਤੌਰ ਤੇ ਵਰਤੋਂ(&U)"
-
-#: filemanagerconfig_ui.ui:130
+#: filemanagerconfig_ui.ui:36
 #, no-c-format
 msgid ""
-"Press this button to select your favorite file manager client. Please note "
-"that the file you select has to have the executable attribute set in order "
-"to be accepted.<br> "
+"The default file manager can be selected by changing the preferred "
+"application for mime type inode/directory in the File Associations control "
+"module"
 msgstr ""
 
-#: filemanagerconfig_ui.ui:152
-#, fuzzy, no-c-format
-msgid "Click here to browse for a file manager program."
-msgstr "ਟਰਮੀਨਲ ਪਰੋਗਰਾਮ ਦੀ ਝਲਕ ਵੇਖਣ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
+#: filemanagerconfig_ui.ui:66
+#, no-c-format
+msgid "Open File Associations module"
+msgstr ""
+
+#: filemanagerconfig_ui.ui:69
+#, no-c-format
+msgid "Click here to open the File Association control module."
+msgstr ""
 
 #: terminalemulatorconfig_ui.ui:72
 #, no-c-format
@@ -252,3 +242,23 @@ msgstr ""
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "ਟਰਮੀਨਲ ਪਰੋਗਰਾਮ ਦੀ ਝਲਕ ਵੇਖਣ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
+
+#, fuzzy
+#~| msgid "Select preferred terminal application:"
+#~ msgid "Select preferred file manager application:"
+#~ msgstr "ਪਸੰਦੀਦਾ ਟਰਮੀਨਲ ਕਾਰਜ ਚੁਣੋ:"
+
+#, fuzzy
+#~| msgid "Use a different &terminal program:"
+#~ msgid "Use a different &file manager program:"
+#~ msgstr "ਵੱਖਰਾ ਟਰਮੀਨਲ ਕਾਰਜ ਵਰਤੋਂ(&t):"
+
+#, fuzzy
+#~| msgid "&Use Konsole as terminal application"
+#~ msgid "&Use Konqueror as file manager application"
+#~ msgstr "ਕੇਨਸੋਲ ਨੂੰ ਟਰਮੀਨਲ ਕਾਰਜ ਦੇ ਤੌਰ ਤੇ ਵਰਤੋਂ(&U)"
+
+#, fuzzy
+#~| msgid "Click here to browse for terminal program."
+#~ msgid "Click here to browse for a file manager program."
+#~ msgstr "ਟਰਮੀਨਲ ਪਰੋਗਰਾਮ ਦੀ ਝਲਕ ਵੇਖਣ ਲਈ ਕਲਿੱਕ ਕਰੋ।"