Merge translation files from master branch.

1 files changed, 61 insertions, 38 deletions

diff --git a/tde-i18n-cy/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-cy/messages/tdebase/kcmcomponentchooser.po
index ab12e88341b..94df4f3190e 100644
--- a/tde-i18n-cy/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-cy/messages/tdebase/kcmcomponentchooser.po
@@ -6,7 +6,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: 2004-07-03 06:59+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -28,28 +28,23 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: componentchooser.cpp:165
+#: componentchooser.cpp:166
 msgid "Select preferred email client:"
 msgstr "Dewiswch eich hoff ddibynnydd ebost:"
 
-#: componentchooser.cpp:271
-#, fuzzy
-msgid "Select preferred file manager application:"
-msgstr "Dewiswch eich hoff gymhwysiad terfynnell:"
-
-#: componentchooser.cpp:342
+#: componentchooser.cpp:309
 msgid "Select preferred terminal application:"
 msgstr "Dewiswch eich hoff gymhwysiad terfynnell:"
 
-#: componentchooser.cpp:437
+#: componentchooser.cpp:404
 msgid "Select preferred Web browser application:"
 msgstr "Dewiswch eich hoff gymhwysiad i bori'r we:"
 
-#: componentchooser.cpp:462
+#: componentchooser.cpp:429
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: componentchooser.cpp:477
+#: componentchooser.cpp:444
 #, fuzzy
 msgid ""
 "<qt>You changed the default component of your choice. Do you want to save "
@@ -58,11 +53,11 @@ msgstr ""
 "<qt>Newidioch gydran ragosod eich dewis, ydych am gadw'r newid yna nawr? "
 "<BR><BR>Bydd dewis <B>Na</B> yn taflu'ch newidiadau</qt>"
 
-#: componentchooser.cpp:481
+#: componentchooser.cpp:448
 msgid "No description available"
 msgstr "Dim disgrifiad ar gael"
 
-#: 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."
@@ -98,7 +93,7 @@ msgid "in the following browser:"
 msgstr "yn y porydd gwe yma:"
 
 #: 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 "..."
@@ -236,33 +231,23 @@ msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Dewiswch y dewisiad yma os hoffech ddefnyddio rhyw rhaglen ebost arall."
 
-#: filemanagerconfig_ui.ui:72
-#, fuzzy, no-c-format
-msgid "Use a different &file manager program:"
-msgstr "Defnyddio rhaglen d&erfynnell arall:"
-
-#: filemanagerconfig_ui.ui:97
-#, fuzzy, no-c-format
-msgid "&Use Konqueror as file manager application"
-msgstr "&Defnyddio Konsole yn gymhwysiad terfynnell"
-
-#: filemanagerconfig_ui.ui:130
-#, fuzzy, no-c-format
+#: 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 ""
-"Gwasgwch y botwm yma i ddewis eich hoff ddibynnydd terfynnell.  Noder bod "
-"rhaid gosod y priodoledd gweithredadwy ar y ffeil a ddewisir iddi gael ei "
-"derbyn. <br>Noder hefyd na fydd rhai rhaglenni sy'n defnyddio Efelychydd "
-"Terfynnell yn gweithio os ychwanegwch ymresymiadau llinell orchymyn "
-"(Enghraifft: knonsole -ls)."
 
-#: filemanagerconfig_ui.ui:152
-#, fuzzy, no-c-format
-msgid "Click here to browse for a file manager program."
-msgstr "Cliciwch yma i bori am y rhaglen derfynnell."
+#: 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
@@ -294,6 +279,44 @@ msgid "Click here to browse for terminal program."
 msgstr "Cliciwch yma i bori am y rhaglen derfynnell."
 
 #, fuzzy
+#~| msgid "Select preferred terminal application:"
+#~ msgid "Select preferred file manager application:"
+#~ msgstr "Dewiswch eich hoff gymhwysiad terfynnell:"
+
+#, fuzzy
+#~| msgid "Use a different &terminal program:"
+#~ msgid "Use a different &file manager program:"
+#~ msgstr "Defnyddio rhaglen d&erfynnell arall:"
+
+#, fuzzy
+#~| msgid "&Use Konsole as terminal application"
+#~ msgid "&Use Konqueror as file manager application"
+#~ msgstr "&Defnyddio Konsole yn gymhwysiad terfynnell"
+
+#, fuzzy
+#~| msgid ""
+#~| "Press this button to select your favorite terminal client. Please note "
+#~| "that the file you select has to have the executable attribute set in "
+#~| "order to be accepted.<br> Also note that some programs that utilize "
+#~| "Terminal Emulator will not work if you add command line arguments "
+#~| "(Example: konsole -ls)."
+#~ 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> "
+#~ msgstr ""
+#~ "Gwasgwch y botwm yma i ddewis eich hoff ddibynnydd terfynnell.  Noder bod "
+#~ "rhaid gosod y priodoledd gweithredadwy ar y ffeil a ddewisir iddi gael ei "
+#~ "derbyn. <br>Noder hefyd na fydd rhai rhaglenni sy'n defnyddio Efelychydd "
+#~ "Terfynnell yn gweithio os ychwanegwch ymresymiadau llinell orchymyn "
+#~ "(Enghraifft: knonsole -ls)."
+
+#, fuzzy
+#~| msgid "Click here to browse for terminal program."
+#~ msgid "Click here to browse for a file manager program."
+#~ msgstr "Cliciwch yma i bori am y rhaglen derfynnell."
+
+#, fuzzy
 #~ msgid "&Use Kontact as preferred email client"
 #~ msgstr "&Defnyddio KMail yn hoff ddibynnydd ebost"