Merge translation files from master branch.

3 files changed, 38 insertions, 26 deletions

diff --git a/tde-i18n-ga/messages/tdegames/kgoldrunner.po b/tde-i18n-ga/messages/tdegames/kgoldrunner.po
index 225402d320e..ebc1da63501 100644
--- a/tde-i18n-ga/messages/tdegames/kgoldrunner.po
+++ b/tde-i18n-ga/messages/tdegames/kgoldrunner.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdegames/kgoldrunner.po\n"
-"POT-Creation-Date: 2020-05-11 04:09+0200\n"
+"POT-Creation-Date: 2022-07-19 18:18+0000\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: ga <LL@li.org>\n"
@@ -37,8 +37,8 @@ msgid ""
 "next level.  A hidden ladder will appear as you collect the last nugget.\n"
 "\n"
 "The hero (the green figure) is your deputy.  To collect the nuggets, just "
-"point the mouse where you want him to go.  At first gravity takes over and "
-"he falls ..."
+"point the mouse where you want the hero to go.  At first gravity takes over "
+"and the hero falls ..."
 msgstr ""
 
 #: data_messages.cpp:36
@@ -50,7 +50,7 @@ msgid ""
 "This is an exercise in moving around.  Follow the track of gold nuggets "
 "until the ladder pops up at the right.  The hero can only follow the mouse "
 "along simple paths (like _ | L or U), so be careful not to get too far ahead "
-"of him.\n"
+"of them.\n"
 "\n"
 "DANGER: Try not to fall off the ladder or bar into the concrete pit at the "
 "bottom right.  If you do get trapped there, the only way out is to kill the "
@@ -65,8 +65,8 @@ msgstr ""
 msgid ""
 "Now you have to dig to get the gold!  Just use the left and right mouse "
 "buttons to dig left or right of the hero's position.  The hero can then jump "
-"into and through the hole he has dug.  He can also dig several holes in a "
-"row and run sideways through the dug holes.  Be careful though.  After a "
+"into and through the hole they have dug.  They can also dig several holes in "
+"a row and run sideways through the dug holes.  Be careful though.  After a "
 "while the holes close up and you can get trapped and killed.\n"
 "\n"
 "In the third box down, you have to dig two holes, jump in and quickly dig "
@@ -91,14 +91,14 @@ msgid ""
 "You can handle enemies by running away, digging a hole or luring them into "
 "part of the playing area where they get stranded.\n"
 "\n"
-"If an enemy falls into a hole, he gives up any gold he is carrying, then "
-"gets stuck in the hole for a time and climbs out.  If the hole closes while "
-"he is in it, he dies and reappears somewhere else on the screen.  You can "
+"If an enemy falls into a hole, they give up any gold they are carrying, then "
+"get stuck in the hole for a time and climb out.  If the hole closes while "
+"they are in it, they die and reappear somewhere else on the screen.  You can "
 "deliberately kill enemies by digging several holes in a row.\n"
 "\n"
 "More importantly, you can run over an enemy's head.  You must do that right "
-"at the start of this level.  Dig a hole, trap the enemy, wait for him to "
-"fall all the way in, then run over him, with the other enemy in hot "
+"at the start of this level.  Dig a hole, trap the enemy, wait for them to "
+"fall all the way in, then run over them, with the other enemy in hot "
 "pursuit..."
 msgstr ""
 
@@ -148,9 +148,9 @@ msgid ""
 "There's nowhere to dig, so you must dodge the enemies and avoid falling to "
 "the concrete at the wrong time.  Try to keep the enemies together.\n"
 "\n"
-"If an enemy has a gold outline, he is holding a nugget.  He might drop it as "
-"he runs over the concrete or maybe at the top of a ladder ...... patience, "
-"patience !!"
+"If an enemy has a gold outline, they are holding a nugget.  They might drop "
+"it as they run over the concrete or maybe at the top of a ladder ...... "
+"patience, patience !!"
 msgstr ""
 
 #: data_messages.cpp:89
@@ -175,9 +175,9 @@ msgid ""
 "It is best not to kill the enemy.  Try it and you will find out why ... Heh, "
 "heh, heh !! ... ;-)\n"
 "\n"
-"If you do kill him unintentionally, before you have collected the gold at "
+"If you do kill them unintentionally, before you have collected the gold at "
 "the top left, you can still finish the level by digging away the side of the "
-"pit he is in."
+"pit they are in."
 msgstr ""
 
 #: data_messages.cpp:103
diff --git a/tde-i18n-ga/messages/tdemultimedia/audiocd_encoder_vorbis.po b/tde-i18n-ga/messages/tdemultimedia/audiocd_encoder_vorbis.po
index f9e09919582..43f80d7a0b8 100644
--- a/tde-i18n-ga/messages/tdemultimedia/audiocd_encoder_vorbis.po
+++ b/tde-i18n-ga/messages/tdemultimedia/audiocd_encoder_vorbis.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdemultimedia/audiocd_encoder_vorbis.po\n"
-"POT-Creation-Date: 2020-05-11 04:03+0200\n"
+"POT-Creation-Date: 2022-07-19 20:16+0000\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: ga <LL@li.org>\n"
@@ -198,11 +198,11 @@ msgid "Add &track information"
 msgstr "Cuir eolas faoin &amhrán leis"
 
 #: encodervorbisconfig.ui:371
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Add a description of the song to the file header. This makes it easy for the "
-"user to get advanced song information shown by his media player. You can get "
-"this information automatically via the Internet. Look at the <i>\"CDDB "
+"user to get advanced song information shown by their media player. You can "
+"get this information automatically via the Internet. Look at the <i>\"CDDB "
 "Retrieval\"</i> control module for details."
 msgstr ""
 "Déan cur síos ar an amhrán do cheanntásc an chomhaid. Is féidir le "
@@ -210,3 +210,15 @@ msgstr ""
 "don úsáideoir. Is féidir an fhaisnéis seo a fháil go díreach ón Idirlíon.  "
 "Féach ar mhodúl rialaithe <i>\"Aisghabháil CDDB\"</i> chun tuilleadh sonraí "
 "a fháil."
+
+#~ msgid ""
+#~ "Add a description of the song to the file header. This makes it easy for "
+#~ "the user to get advanced song information shown by his media player. You "
+#~ "can get this information automatically via the Internet. Look at the <i>"
+#~ "\"CDDB Retrieval\"</i> control module for details."
+#~ msgstr ""
+#~ "Déan cur síos ar an amhrán do cheanntásc an chomhaid. Is féidir le "
+#~ "seinnteoirí meán an fhaisnéis seo a úsáid chun eolas cabhrach a "
+#~ "thaispeáint don úsáideoir. Is féidir an fhaisnéis seo a fháil go díreach "
+#~ "ón Idirlíon.  Féach ar mhodúl rialaithe <i>\"Aisghabháil CDDB\"</i> chun "
+#~ "tuilleadh sonraí a fháil."
diff --git a/tde-i18n-ga/messages/tdepim/kmail.po b/tde-i18n-ga/messages/tdepim/kmail.po
index 8b7753c771d..15519bbdfc6 100644
--- a/tde-i18n-ga/messages/tdepim/kmail.po
+++ b/tde-i18n-ga/messages/tdepim/kmail.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepim/kmail.po\n"
-"POT-Creation-Date: 2022-04-06 20:16+0000\n"
+"POT-Creation-Date: 2022-07-19 20:15+0000\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: ga <LL@li.org>\n"
@@ -2195,7 +2195,7 @@ msgid ""
 "generalization of what is commonly called <b>read receipt</b>. The message "
 "author requests a disposition notification to be sent and the receiver's "
 "mail program generates a reply from which the author can learn what happened "
-"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"to their message. Common disposition types include <b>displayed</b> (i.e. "
 "read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
 "following options are available to control KMail's sending of MDNs:</"
 "p><ul><li><em>Ignore</em>: Ignores any request for disposition "
@@ -2205,7 +2205,7 @@ msgid ""
 "or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
 "<b>denied</b> notification. This is only <em>slightly</em> better than "
 "always sending MDNs. The author will still know that the messages has been "
-"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"acted upon, they just cannot tell whether it was deleted or read etc.</"
 "li><li><em>Always send</em>: Always sends the requested disposition "
 "notification. That means that the author of the message gets to know when "
 "the message was acted upon and, in addition, what happened to it (displayed, "
@@ -6857,9 +6857,9 @@ msgid ""
 "tasks in this folder. The setting applies to Calendar and Task folders only "
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
-"Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins"
-"\", since the secretary has no admin rights on the folder.\n"
+"Example use cases: if the boss shares a folder with their secretary, only "
+"the boss should be marked as busy for their meetings, so they should select "
+"\"Admins\", since the secretary has no admin rights on the folder.\n"
 "On the other hand if a working group shares a Calendar for group meetings, "
 "all readers of the folders should be marked as busy for meetings.\n"
 "A company-wide folder with optional events in it would use \"Nobody\" since "