updated Scottish Gaelic translation

2018-09-15 00:06:14 +02:00 · 2018-09-15 00:06:14 +02:00 · 5ac5930d17
commit 5ac5930d17
parent 1d08fdc70f
13 changed files with 471 additions and 696 deletions
--- a/changelog.md
+++ b/changelog.md
@ -22,7 +22,7 @@
     * New graphics for Eloh.
 ### Language and i18n
   * Updated translations: British English, Chinese (Traditional), Czech, French,
-     German, Italian, Ukrainian
+     German, Italian, Scottish Gaelic, Ukrainian
 ### User Interface
   * On laptop computers we now show how much battery you have left
   * MacOS: Fixed moving the mouse with a touchpad also scrolling GUI dialogs
--- a/po/wesnoth-ai/gd.po
+++ b/po/wesnoth-ai/gd.po
@ -1,21 +1,20 @@
 # Translators:
 # GunChleoc, 2017
-# GunChleoc <fios@foramnagaidhlig.net>, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.wesnoth.org/\n"
 "POT-Creation-Date: 2018-09-09 08:38 UTC\n"
-"PO-Revision-Date: 2018-05-07 10:56+0100\n"
-"Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
-"Language-Team: Fòram na Gàidhlig\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: GunChleoc, 2017\n"
+"Language-Team: Gaelic, Scottish (https://www.transifex.com/gunchleoc/"
+"teams/12769/gd/)\n"
 "Language: gd\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
 "(n > 2 && n < 20) ? 2 : 3;\n"
-"X-Generator: Virtaal 0.7.1\n"

 #. [ai]: id=ai_default_rca
 #: data/ai/ais/ai_default_rca.cfg:9
@ -143,11 +142,6 @@ msgid ""
 "[micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</"
 "span> at https://wiki.wesnoth.org/Micro_AIs for more information."
 msgstr ""
-"Seo ath-achdachadh dhen chnàmh-sgeul “Na sìthichean fo shèist” aig an "
-"iomairt “Oighre na cathrach” ach an cluich IF an taobh aig Conall an-seo. Is "
-"an t-amas gun gluais Conall dhan t-sanas taobh iar-thuath fhad ’s a mhaireas "
-"Conall agus Deilfeadar beò. Seo an aon IF ’s a tha sa chnàmh-sgeul “Dìon "
-"aonad”"

 #. [event]
 #: data/ai/micro_ais/scenarios/The_Elves_Besieged.cfg:226
@ -553,7 +547,7 @@ msgstr "Rabhg"
 #. [side]: type=Dread Bat, id=Dreadful Bat
 #: data/ai/micro_ais/scenarios/dragon.cfg:33
 msgid "Dreadful Bat"
-msgstr "Ialtag Uabhasach"
+msgstr "Ialtag uabhasach"

 #. [event]
 #: data/ai/micro_ais/scenarios/dragon.cfg:51
@ -709,18 +703,6 @@ msgstr "Cuir smachd daonna air Taobh 1 dheth"

 #. [message]: speaker=narrator
 #: data/ai/micro_ais/scenarios/goto.cfg:419
-#, fuzzy
-#| msgid ""
-#| "This is a reenactment of scenario The Elves Besieged of the mainline "
-#| "campaign Heir to the Throne, just that the AI is playing Konrad's side "
-#| "here. The goal is to move Konrad to the signpost in the northwest, while "
-#| "keeping both Konrad and Delfador alive. The same AI as in scenario "
-#| "Protect Unit is used.\n"
-#| "\n"
-#| "Note: The Protect Unit AI is coded as a Micro AI. A Micro AI can be added "
-#| "and adapted to the need of a scenario easily using only WML and the "
-#| "[micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</"
-#| "span> at https://wiki.wesnoth.org/Micro_AIs for more information."
 msgid ""
 "This scenario demonstrates a variety of different uses of the Goto Micro AI. "
 "All AI sides are controlled by this MAI in one way or another (except for "
@ -736,11 +718,6 @@ msgid ""
 "tag. Check out the <span color='#00A000'>Micro AI wiki page</span> at "
 "https://wiki.wesnoth.org/Micro_AIs for more information."
 msgstr ""
-"Seo ath-achdachadh dhen chnàmh-sgeul “Na sìthichean fo shèist” aig an "
-"iomairt “Oighre na cathrach” ach an cluich IF an taobh aig Conall an-seo. Is "
-"an t-amas gun gluais Conall dhan t-sanas taobh iar-thuath fhad ’s a mhaireas "
-"Conall agus Deilfeadar beò. Seo an aon IF ’s a tha sa chnàmh-sgeul “Dìon "
-"aonad”"

 #. [objectives]
 #: data/ai/micro_ais/scenarios/goto.cfg:429
@ -1247,18 +1224,6 @@ msgstr "Gluaisidh an ceatharnach-coille an-seo"

 #. [message]: speaker=Good Bandit
 #: data/ai/micro_ais/scenarios/hang_out.cfg:120
-#, fuzzy
-#| msgid ""
-#| "This is a reenactment of scenario The Elves Besieged of the mainline "
-#| "campaign Heir to the Throne, just that the AI is playing Konrad's side "
-#| "here. The goal is to move Konrad to the signpost in the northwest, while "
-#| "keeping both Konrad and Delfador alive. The same AI as in scenario "
-#| "Protect Unit is used.\n"
-#| "\n"
-#| "Note: The Protect Unit AI is coded as a Micro AI. A Micro AI can be added "
-#| "and adapted to the need of a scenario easily using only WML and the "
-#| "[micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</"
-#| "span> at https://wiki.wesnoth.org/Micro_AIs for more information."
 msgid ""
 "That outlaw over there is going to run for the keep in the southeast.  He's "
 "only going to recruit for three rounds before he'll start moving and he and "
@ -1273,11 +1238,6 @@ msgid ""
 "the <span color='#00A000'>Micro AI wiki page</span> at https://wiki.wesnoth."
 "org/Micro_AIs for more information."
 msgstr ""
-"Seo ath-achdachadh dhen chnàmh-sgeul “Na sìthichean fo shèist” aig an "
-"iomairt “Oighre na cathrach” ach an cluich IF an taobh aig Conall an-seo. Is "
-"an t-amas gun gluais Conall dhan t-sanas taobh iar-thuath fhad ’s a mhaireas "
-"Conall agus Deilfeadar beò. Seo an aon IF ’s a tha sa chnàmh-sgeul “Dìon "
-"aonad”"

 #. [objectives]
 #: data/ai/micro_ais/scenarios/hang_out.cfg:127
@ -1459,18 +1419,6 @@ msgstr "An aire"

 #. [message]: speaker=narrator
 #: data/ai/micro_ais/scenarios/lurkers.cfg:475
-#, fuzzy
-#| msgid ""
-#| "This is a reenactment of scenario The Elves Besieged of the mainline "
-#| "campaign Heir to the Throne, just that the AI is playing Konrad's side "
-#| "here. The goal is to move Konrad to the signpost in the northwest, while "
-#| "keeping both Konrad and Delfador alive. The same AI as in scenario "
-#| "Protect Unit is used.\n"
-#| "\n"
-#| "Note: The Protect Unit AI is coded as a Micro AI. A Micro AI can be added "
-#| "and adapted to the need of a scenario easily using only WML and the "
-#| "[micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</"
-#| "span> at https://wiki.wesnoth.org/Micro_AIs for more information."
 msgid ""
 "You can use the right-click context menu to add additional lurkers.\n"
 "\n"
@ -1482,11 +1430,6 @@ msgid ""
 "tag. Check out the <span color='#00A000'>Micro AI wiki page</span> at "
 "https://wiki.wesnoth.org/Micro_AIs for more information."
 msgstr ""
-"Seo ath-achdachadh dhen chnàmh-sgeul “Na sìthichean fo shèist” aig an "
-"iomairt “Oighre na cathrach” ach an cluich IF an taobh aig Conall an-seo. Is "
-"an t-amas gun gluais Conall dhan t-sanas taobh iar-thuath fhad ’s a mhaireas "
-"Conall agus Deilfeadar beò. Seo an aon IF ’s a tha sa chnàmh-sgeul “Dìon "
-"aonad”"

 #. [objectives]
 #: data/ai/micro_ais/scenarios/lurkers.cfg:485
@ -1568,18 +1511,6 @@ msgstr ""

 #. [message]: speaker=narrator
 #: data/ai/micro_ais/scenarios/messenger_escort.cfg:152
-#, fuzzy
-#| msgid ""
-#| "This is a reenactment of scenario The Elves Besieged of the mainline "
-#| "campaign Heir to the Throne, just that the AI is playing Konrad's side "
-#| "here. The goal is to move Konrad to the signpost in the northwest, while "
-#| "keeping both Konrad and Delfador alive. The same AI as in scenario "
-#| "Protect Unit is used.\n"
-#| "\n"
-#| "Note: The Protect Unit AI is coded as a Micro AI. A Micro AI can be added "
-#| "and adapted to the need of a scenario easily using only WML and the "
-#| "[micro_ai] tag. Check out the <span color='#00A000'>Micro AI wiki page</"
-#| "span> at https://wiki.wesnoth.org/Micro_AIs for more information."
 msgid ""
 "The Messenger Escort AI will try to move the dragoon messenger to the "
 "signpost in the north, while protecting him as well as possible with the "
@ -1598,11 +1529,6 @@ msgid ""
 "tag. Check out the <span color='#00A000'>Micro AI wiki page</span> at "
 "https://wiki.wesnoth.org/Micro_AIs for more information."
 msgstr ""
-"Seo ath-achdachadh dhen chnàmh-sgeul “Na sìthichean fo shèist” aig an "
-"iomairt “Oighre na cathrach” ach an cluich IF an taobh aig Conall an-seo. Is "
-"an t-amas gun gluais Conall dhan t-sanas taobh iar-thuath fhad ’s a mhaireas "
-"Conall agus Deilfeadar beò. Seo an aon IF ’s a tha sa chnàmh-sgeul “Dìon "
-"aonad”"

 #. [objective]: condition=win
 #: data/ai/micro_ais/scenarios/messenger_escort.cfg:165
--- a/po/wesnoth-aoi/gd.po
+++ b/po/wesnoth-aoi/gd.po
@ -1,21 +1,20 @@
 # Translators:
 # GunChleoc, 2017
-# GunChleoc <fios@foramnagaidhlig.net>, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.wesnoth.org/\n"
 "POT-Creation-Date: 2018-09-09 08:37 UTC\n"
-"PO-Revision-Date: 2018-05-07 10:56+0100\n"
-"Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
-"Language-Team: Fòram na Gàidhlig\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: GunChleoc, 2017\n"
+"Language-Team: Gaelic, Scottish (https://www.transifex.com/gunchleoc/"
+"teams/12769/gd/)\n"
 "Language: gd\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
 "(n > 2 && n < 20) ? 2 : 3;\n"
-"X-Generator: Virtaal 0.7.1\n"

 #. [campaign]: id=An_Orcish_Incursion
 #: data/campaigns/An_Orcish_Incursion/_main.cfg:11
@ -148,8 +147,8 @@ msgstr ""
 "Air  feadh beagan bhliadhnaichean an dèidh muinntir Thaldraig a bhualadh "
 "tràigh, cha bhiodh na deamhain ach fàthan a chuireadh an-shocair air tìr "
 "uaine nan sìthichean. ’S ann mar sin a bhiodh cùisean gus an latha a sheas "
-"Earlornas, duine-uasal nan sìthichean, an aghaidh nàmhad air nach facadh a "
-"leithid roimhe riamh."
+"Earlornas, duine-sìthe uasal, an aghaidh nàmhad air nach facadh a leithid "
+"roimhe riamh."

 #. [part]
 #. "northern marches" is *not* a typo for "northern marshes" here.
@ -670,12 +669,6 @@ msgstr "(<i>Casad</i>) Bidh mi a’ feitheamh ort ... am measg ’nam marbh ..."

 #. [message]: speaker=narrator
 #: data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg:222
-#, fuzzy
-#| msgid ""
-#| "The orcish chieftain finally fell, overcome by his wounds. The elves "
-#| "found themselves in a half-ruined camp littered with the bodies of both "
-#| "sides.There was no hale orc in sight, nor did any of the wounded beg "
-#| "mercy. The elves took no prisoners."
 msgid ""
 "The orcish chieftain finally fell, overcome by his wounds. The elves found "
 "themselves in a half-ruined camp littered with the bodies of both sides. "
@ -730,10 +723,6 @@ msgstr ""

 #. [message]: role=advisor
 #: data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg:265
-#, fuzzy
-#| msgid ""
-#| "What about the loot lord? We found supplies worth over a hundred gold in "
-#| "the camp."
 msgid ""
 "What about the loot, lord? We found supplies worth over a hundred gold in "
 "the camp."
@ -771,8 +760,6 @@ msgstr ""

 #. [message]: role=advisor
 #: data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg:320
-#, fuzzy
-#| msgid "We can’t carry on Lord, the men are too tired. We have to fall back."
 msgid "We can’t carry on, lord, the men are too tired. We have to fall back."
 msgstr ""
 "Chan urrainn dhuinn leantainn oirnn, a thighearna. Feumaidh sinn cùlachadh a "
@ -1256,12 +1243,11 @@ msgid ""
 msgstr ""
 "Dhùin Earlornas a shùilean is shìn e a dhà làmh, ’gan cur ri chèile ann an "
 "cruth cupa fosgailte dha na speuran. Thòisich iad air luisneachadh an ceann "
-"greis is an uair sin air dol ’nan lasan mar phràisiche le teine nan "
-"sìthichean, a’ cur teine fuar gorm timcheall air a’ mhorair. Thog sionnachan "
-"solais bho na lasairean uaigealta agus le beagan fhaclan sèimhe bhon "
-"mhorair, sgìthich iad an comhair an tùir shìos. An uair sin, chrìon an solas "
-"timcheall air Earlornas is a rèir coltais, thill a h&#8209;uile rud mar a "
-"bha."
+"greis is an uair sin air dol ’nan lasan mar phràisiche le teine-sìthe, a’ "
+"cur teine fuar gorm timcheall air a’ mhorair. Thog sionnachan solais bho na "
+"lasairean uaigealta agus le beagan fhaclan sèimhe bhon mhorair, sgìthich iad "
+"an comhair an tùir shìos. An uair sin, chrìon an solas timcheall air "
+"Earlornas is a rèir coltais, thill a h&#8209;uile rud mar a bha."

 #. [message]: speaker=narrator
 #: data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg:212
@ -1283,9 +1269,9 @@ msgid ""
 "Scarcely less than I find yours, my lord elf, but I would welcome your aid "
 "against these orcs. They have been besieging my tower for weeks."
 msgstr ""
-"Mar a tha an làthaireachd agaibh dhomhsa, mo thighearna shìthiche, ach "
-"chuirinn fàilte air ur taic an aghaidh nan deamhan seo. Tha iad a’ sèisteadh "
-"an tùr agam bho chionn seachdainnean."
+"Mar a tha an làthaireachd agaibh dhomhsa, mo thighearna-shìthe, ach chuirinn "
+"fàilte air ur taic an aghaidh nan deamhan seo. Tha iad a’ sèisteadh an tùr "
+"agam bho chionn seachdainnean."

 #. [message]: id=Erlornas
 #: data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg:246
@ -1481,8 +1467,8 @@ msgid ""
 "Puny elves! My full army will be here soon, and then we will crush you. You "
 "will beg for a quick death!"
 msgstr ""
-"A sheargairean shìthiche! Bidh am  feachd slàn agam an-seo a dh’aithghearr "
-"is cuiridh sinn às dhiubh. Grìosaichidh sibh bàs luath oirnn!"
+"A sheargairean-shìthe! Bidh am  feachd slàn agam an-seo a dh’aithghearr is "
+"cuiridh sinn às dhiubh. Grìosaichidh sibh bàs luath oirnn!"

 #. [message]: speaker=unit
 #: data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg:229
--- a/po/wesnoth-editor/gd.po
+++ b/po/wesnoth-editor/gd.po
@ -125,7 +125,7 @@ msgstr "sònraichte"
 #. Describes a scenario in the editor that has not set a time of day schedule
 #: data/core/editor/time-of-day.cfg:6
 msgid "time of day^None"
-msgstr "Chan eil gin"
+msgstr "Gun àm"

 #. [editor_times]: id=test
 #: data/core/editor/time-of-day.cfg:11
@ -303,7 +303,7 @@ msgstr ""

 #: src/editor/controller/editor_controller.cpp:221
 msgid "No editor time-of-day found."
-msgstr "Cha deach àm-an-latha deasaiche a lorg."
+msgstr "Cha deach àm dhen latha deasaiche a lorg."

 #: src/editor/controller/editor_controller.cpp:1147
 msgid "Change Unit ID"
--- a/po/wesnoth-help/gd.po
+++ b/po/wesnoth-help/gd.po
@ -31,7 +31,7 @@ msgstr "Fon talamh"
 #: data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg:667
 #: data/core/macros/abilities.cfg:274
 msgid "berserk"
-msgstr "caothach a’ chatha"
+msgstr "mire-chatha"

 #. [berserk]: id=berserk
 #: data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg:669
@ -979,46 +979,6 @@ msgstr "An Taobh Tuath"

 #. [topic]: id=northlands
 #: data/core/encyclopedia/geography.cfg:114
-#, fuzzy
-#| msgid ""
-#| "There is no government of the Northlands. Various groups of orcs, "
-#| "dwarves, barbarian men and even elves populate the region. The northern "
-#| "and eastern borders are not defined, the southern border is the "
-#| "<ref>dst='great_river' text='Great River'</ref>, and the western border "
-#| "is the <ref>dst='great_ocean' text='Great Ocean'</ref>.\n"
-#| "\n"
-#| "<header>text='Notable cities:'</header>\n"
-#| "    • Glamdrol: An Orcish tribal capital.\n"
-#| "    • Wesmere: The location of the Ka’lian — the Elvish Council.\n"
-#| "    • Dwarven Doors: A mixed human/dwarven town in the region of Knalga "
-#| "in the southern Heart Mountains. A major trade center.\n"
-#| "    • Dallben and Delwyn: Human villages originally built by settlers who "
-#| "crossed the Great River during Wesnoth’s Golden Age expansion. Now "
-#| "abandoned. The forested area northeast of Elensefar, where these villages "
-#| "were located, was named the Annuvin province by men but was known by the "
-#| "elves as Wesmere.\n"
-#| "\n"
-#| "<header>text='Notable land features:'</header>\n"
-#| "    • Heart Mountains: A virtually impassable barrier between the river "
-#| "country and the Northern Plains.\n"
-#| "    • Heartfangs: the particularly forbidding stretch of high peaks "
-#| "southwest of Lake Vrug and north of the Forest of Wesmere. The most "
-#| "inhospitable and dangerous portion of the Heart Mountains; only hermits, "
-#| "madmen, and mages live there.\n"
-#| "    • Swamp of Dread: a very large bog located between the Heart "
-#| "Mountains and the Great River. A notoriously dangerous place.\n"
-#| "    • Lake Vrug: A large mountain lake whose river carves the only "
-#| "pathway through the Northern Mountains.\n"
-#| "    • Arkan-thoria: The river that comes out of Lake Vrug. This is the "
-#| "elvish name; among humans it is called Longlier.\n"
-#| "    • River Listra: The south-running tributary of the Great River into "
-#| "which the Arkan-thoria empties.\n"
-#| "    • Lintanir Forest: The southernmost portion of the Great Northern "
-#| "Forest, a gigantic wood whose eastern and northern boundaries are known "
-#| "only the elves. Their capitol, Elensiria, has only seldom been visited by "
-#| "humans.\n"
-#| "    • Great River: The origin of this river is somewhere in the east of "
-#| "the northern lands."
 msgid ""
 "There is no government of the Northlands. Various groups of orcs, dwarves, "
 "barbarian men and even elves populate the region. The northern and eastern "
@ -1104,7 +1064,7 @@ msgstr ""
 #. [topic]: id=southwest_elven_lands
 #: data/core/encyclopedia/geography.cfg:135
 msgid "Southwest Elven Lands"
-msgstr "Tìr Iar-dheas nan Sìthichean"
+msgstr "Tìr iar-dheas nan sìthichean"

 #. [topic]: id=southwest_elven_lands
 #: data/core/encyclopedia/geography.cfg:136
@ -1241,7 +1201,7 @@ msgstr ""
 #. [section]: id=schedule
 #: data/core/help.cfg:14
 msgid "Time of Day Schedule"
-msgstr "Sgeideal àm an latha"
+msgstr "Sgeideal ama dhen latha"

 #. [section]: id=introduction
 #. [topic]: id=..introduction
@ -2130,7 +2090,7 @@ msgstr ""
 "mearachd air buille is cha dèan e dochann sam bith. Bidh buillean aig gach "
 "aonad fear mu seach gus am bidh an dà chuid dhiubh air na buillean aca uile "
 "a chleachdadh. Tha an t-àireamh de bhuillean a bhios aig aonad "
-"caochlaideach; mar eisimpleir, faodaidh cathach sìthiche le ionnsaigh 5×4 "
+"caochlaideach; mar eisimpleir, faodaidh cathach-sìthe le ionnsaigh 5×4 "
 "bualadh 4 tursan le 5 dochann le gach buille shoirbheachail fhad ’s nach "
 "urrainn dha mhadagan deamhain le ionnsaigh 9×2 ach 2 bhuille a thoirt (ach "
 "le 9 dochainn le gach buille shoirbheachail)."
@ -2217,11 +2177,11 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Nì gach buille a bhuaileas gu soirbheachail dochann bunasach, a’ crochadh "
-"air seòrsa na h-ionnsaighe. Mar eisimpleir, ’s e 5 de dhochann bunasach a nì "
-"cathach sìthiche aig a bheil ionnsaigh 5×4. Thèid seo atharrachadh le dà "
-"rud: <ref>dst='damage_types_and_resistance' text='comas-seasaimh'</ref> is "
-"<ref>dst='time_of_day' text='àm an latha'</ref>. Gus faicinn mar a thèid "
+"Nì gach buille a bhuaileas gu soirbheachail dochann bunasach a-rèir seòrsa "
+"na h-ionnsaighe. Mar eisimpleir, ’s e 5 de dhochann bunasach a nì cathach-"
+"sìthe aig a bheil ionnsaigh 5×4. Thèid seo atharrachadh le dà rud: "
+"<ref>dst='damage_types_and_resistance' text='comas-seasaimh'</ref> is "
+"<ref>dst='time_of_day' text='àm dhen latha'</ref>. Gus faicinn mar a thèid "
 "dochann atharrachadh leis na cùisean seo, tagh <bold>text='Cunntas "
 "dochainn'</bold> ann an clàr-taice roghnachadh na h-ionnsaighe."

@ -2239,10 +2199,9 @@ msgstr ""
 "\n"
 "Tha <ref>dst='..abilities_section' text='comasan'</ref> sònraichte aig cuid "
 "de dh’aonadan a bheir buaidh air an dochann a thèid a thoirt seachad ann an "
-"cath. Tha <ref>dst='weaponspecial_charge' text='cruinn-leum'</ref> as "
-"cumanta ’nam measg is nì e dà uiread de dhochann air an dà chuid "
-"ionnsaighear is dìonadair nuair a bhios an t-aonad aig a bheil cruinn-leum "
-"’na ionnsaighear."
+"cath. Tha <ref>dst='weaponspecial_charge' text='brùchdadh'</ref> as cumanta "
+"’nam measg is nì e dà uiread de dhochann air an dà chuid ionnsaighear is "
+"dìonadair nuair a bhios an t-aonad aig a bheil brùchdadh ’na ionnsaighear."

 #. [topic]: id=damage_types_and_resistance
 #: data/core/help.cfg:306
@ -2366,7 +2325,7 @@ msgstr " Chan eil cruinne os cionn a’ bhàir-lùiths aig aonadan nàmhad."
 #. [topic]: id=time_of_day
 #: data/core/help.cfg:333
 msgid "Time of Day"
-msgstr "Àm an latha"
+msgstr "Àm dhen latha"

 #. [topic]: id=time_of_day
 #: data/core/help.cfg:334
@ -2381,12 +2340,12 @@ msgid ""
 "• <bold>text='Liminal'</bold> units get −25% damage during both night and "
 "daytime."
 msgstr ""
-"Tha buaidh aig àm an latha air an dochann a nì cuid de dh’aonadan:\n"
+"Tha buaidh aig àm dhen latha air an dochann a nì cuid de dh’aonadan:\n"
 "– Nì aonadan <bold>text='dligheach'</bold> +25% de dhochann air an latha is "
 "-25 dheth air an oidhche.\n"
 "– Nì aonadan <bold>text='coimeasgach'</bold> +25% de dhochann air an oidhche "
 "is -25% dheth air an latha.\n"
-"– Tha aonadan <bold>text='neodrach'</bold> coma mu dhèidhinn oidhche no "
+"– Tha aonadan <bold>text='neodrach'</bold> coma mu dhèidhinn an ama dhen "
 "latha\n"
 "– Nì aonadan <bold>text='stairsnich'</bold> -25% de dhochann an dà chuid air "
 "an oidhche is air an latha."
@ -2403,7 +2362,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Chì thu dè àm an latha a th’ agad fon mheanbh-mhapa san leòsan staide. "
+"Chì thu dè àm dhen latha a th’ agad fon mheanbh-mhapa san leòsan staide. "
 "Airson a’ chearcaill àbhaisteach de dh’oidhche is latha, cunntaidh madainn "
 "is feasgar mar latha agus a’ chiad is an dàrna faire mar oidhche:\n"
 "\n"
@ -3151,11 +3110,6 @@ msgstr ""

 #. [topic]: id=using_addons
 #: data/core/help.cfg:494
-#, fuzzy
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "<header>text='Creator Resources'</header>"
 msgid ""
 "\n"
 "\n"
@ -3163,7 +3117,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"<header>text='Goireasan cruthachaidh'</header>"
+"<header>text=’Eiteanan'</header>"

 #. [topic]: id=using_addons
 #: data/core/help.cfg:496
@ -3178,6 +3132,17 @@ msgid ""
 "War II campaign, or even a different game altogether, as long as it can be "
 "represented as a hexagonal map with ’units’ in some way."
 msgstr ""
+"\n"
+"\n"
+"Leigidh eitean leat geama gu tur eadar-dhealaichte a chluich le einnsein "
+"Blàir Bheasnaid. ’S urrainn do dh’eitean susbaint ùr a chur an àite gach nì "
+"am broinn Bheasnaid: nuair a bhios eitean eadar-dhealaichte air a luchdadh, "
+"cha bhi na h-aonadan is cruthan-tìre àbhaisteach is a leithid ri làimh.\n"
+"\n"
+"Gabhaidh dreach glè eadar-dhealaichte a chur air a’ gheama le eitean: mar "
+"eisimpleir, iomairt an Dàrna cogaidh, no geama gu tur eadar-dhealaichte cho "
+"fad ’s a ghabhas a riochdachadh air mapa sia-cheàrnach agus “aonadan” air "
+"choireigin air."

 #. [topic]: id=using_addons
 #: data/core/help.cfg:500
@ -3217,31 +3182,6 @@ msgstr "A’ stàladh tuilleadain"

 #. [topic]: id=installing_addons
 #: data/core/help.cfg:512
-#, fuzzy
-#| msgid ""
-#| "User-made add-ons can be obtained and updated through the "
-#| "<italic>text='Add-ons'</italic> option in the main menu. After connecting "
-#| "to the add-ons server (by default <italic>text='add-ons.wesnoth.org'</"
-#| "italic>), you will be presented with a list of add-ons available on the "
-#| "server for downloading.\n"
-#| "\n"
-#| "The installation status for each add-on is shown below each entry. For "
-#| "add-ons that are <italic>text='upgradable'</italic> or "
-#| "<italic>text='outdated'</italic> on the server, their installed and "
-#| "published versions will be shown in the <italic>text='Version'</italic> "
-#| "column.\n"
-#| "\n"
-#| "To search for add-ons by keywords, type any relevant terms in any order "
-#| "in the <bold>text='Filter'</bold> box, separated by spaces. You can also "
-#| "sort the add-on list by clicking the column headers. It is also possible "
-#| "to choose to only display add-ons of specific categories by clicking on "
-#| "the <bold>text='Options'</bold> button in the top-right corner.\n"
-#| "\n"
-#| "To install an add-on, select it from the list and click the "
-#| "<bold>text='+'</bold> icon, or simply double-click on the add-on’s title. "
-#| "The <bold>text='Description'</bold> button provides you with additional "
-#| "details about the add-on, such as its full description, installation "
-#| "status, and available languages."
 msgid ""
 "User-made add-ons can be obtained and updated through the <italic>text='Add-"
 "ons'</italic> option in the main menu. After connecting to the add-ons "
@ -3279,18 +3219,18 @@ msgstr ""
 "<italic>text='Tionndadh'</italic>.\n"
 "\n"
 "Ma tha thu airson faclan-luirg a chleachdadh gus tuilleadan a lorg, sgrìobh "
-"na faclan iomchaidh ann an òrdugh sam bith sa bhogsa <bold>text='Criathrag'</"
-"bold> le beàrnan eatorra. ’S urrainn dhut liosta nan tuilleadan a "
-"sheòrsachadh cuideachd le briogadh air ceann-sgrìobhadh cuilbh. Cuideachd, "
-"’s urrainn dhut am putan <bold>text='Roghainnean'</bold> aig a’ bharr gu "
-"deas a chleachdadh gus nach seall thu ach tuilleadain de sheòrsa "
-"sònraichte.\n"
+"na faclan iomchaidh ann an òrdugh sam bith sa bhogsa-luirg le beàrnan "
+"eatorra. ’S urrainn dhut liosta nan tuilleadan a sheòrsachadh cuideachd le "
+"briogadh air ceann-sgrìobhadh cuilbh. Cuideachd, ’s urrainn dhut an clàr-"
+"taice <bold>text='Seòrsa'</bold> gus nach seall thu ach tuilleadain de "
+"sheòrsa sònraichte.\n"
 "\n"
 "Gus tuilleadan a stàladh, tagh air an liosta e agus briog air ìomhaigheag "
 "<bold>text='+'</bold> no dèan briogadh dùbailte air tiotal an tuilleadain. "
-"Bheir am putan <bold>text='Tuairisgeul'</bold> barrachd fiosrachaidh mun "
-"tuilleadan dhut a leithid tuairisgeul slàin, staid an stàlaidh agus cànanan "
-"rim faighinn."
+"Ma tha an uinneag ro bheag gus a h-uile càil a shealltainn sa bhad, bheir am "
+"putan <bold>text='Tuairisgeul'</bold> barrachd fiosrachaidh mun tuilleadan "
+"dhut a leithid tuairisgeul slàin, staid an stàlaidh agus eadar-"
+"theangachaidhean rim faighinn."

 #. [topic]: id=removing_addons
 #: data/core/help.cfg:525
@ -4166,7 +4106,7 @@ msgstr ""
 #. [damage]: id=charge
 #: data/core/macros/abilities.cfg:381
 msgid "charge"
-msgstr "cruinn-leum"
+msgstr "brùchdadh"

 #. [damage]: id=charge
 #: data/core/macros/abilities.cfg:382
@ -4558,8 +4498,8 @@ msgid ""
 " Whenever its berserk attack is used, this unit continues to push the attack "
 "until either it or its enemy lies dead."
 msgstr ""
-" Gach turas a chleachdas an t-aonad seo caothach a’ chatha, leanaidh e air "
-"a’ toirt ionnsaigh gus am bi e fhèin no a nàmhaid marbh."
+" Gach turas a ghabhas an t-aonad seo mire-chatha, leanaidh e air a’ toirt "
+"ionnsaigh gus am bi e fhèin no a nàmhaid marbh."

 #: data/core/macros/special-notes.cfg:62
 msgid ""
@ -4623,7 +4563,7 @@ msgid ""
 " Using a charging attack doubles both damage dealt and received; this does "
 "not affect defensive retaliation."
 msgstr ""
-" Le ionnsaigh cruinn-leum, nì is gheibh thu dà uimhir de dhochann. Cha toir "
+" Le ionnsaigh brùchdaidh, nì is gheibh thu dà uimhir de dhochann. Cha toir "
 "seo buaidh air dìoladh dìona."

 #: data/core/macros/special-notes.cfg:86
@ -4844,7 +4784,7 @@ msgstr ""
 "\n"
 "Ged a tha e feumail do gach aonad aig a bheil ionnsaigh dlùth, tha am feart "
 "<italic>text='làidir'</italic> nas èifeachdaiche le aonadan aig a bheil "
-"iomadh ionnsaigh a leithid a’ chathaich shìthiche. Faodaidh aonadan làidir a "
+"iomadh ionnsaigh a leithid a’ chathaich-shìthe. Faodaidh aonadan làidir a "
 "bhith glè fheumail nuair nach eil ach glè bheag a bharrachd de dhochann a "
 "dhìth gus nàmhaid a sgrios."

@ -5540,7 +5480,7 @@ msgstr "Sìthiche"
 #. [race]: id=elf
 #: data/core/units.cfg:115
 msgid "race+female^Elf"
-msgstr "Ban-sìthiche"
+msgstr "Ban-sìthe"

 #. [race]: id=elf
 #: data/core/units.cfg:116
--- a/po/wesnoth-httt/gd.po
+++ b/po/wesnoth-httt/gd.po
@ -711,10 +711,10 @@ msgstr ""
 "’S e cinneadh cumhachdach a th’ anns na sìthichean, a Chonaill, nas "
 "cumhachdaiche na dh’aideachadh mo cuideachd mar as trice. Co-dhiù, tha "
 "marcaichean cumhachdach air dòighean eile. Chan eil ionnsaigh astair fada "
-"aca ach ’s urrainn dhaibh cruinn-leum don chath is dà uiread de dhochann a "
-"dhèanamh, ged a ghabhas iad fhèin dà uiread de dhochann an uairsin. Tha iad "
-"dligheach cuideachd is ’s ciall dha sin gun dèan iad sabaid nas fhearr air "
-"an latha is nas dona air an oidhche. Chan eil an leithid ann air tìr "
+"aca ach ’s urrainn dhaibh brùchdadh air an nàmhaid is dà uiread de dhochann "
+"a dhèanamh, ged a ghabhas iad fhèin dà uiread de dhochann an uairsin. Tha "
+"iad dligheach cuideachd is ’s ciall dha sin gun dèan iad sabaid nas fhearr "
+"air an latha is nas dona air an oidhche. Chan eil an leithid ann air tìr "
 "fosgailte ged a shoirbhicheas sìthichean nas fhearr leat ann an coilltean no "
 "air tìr garbh."

@ -3636,7 +3636,7 @@ msgid ""
 "small to carry a mount."
 msgstr ""
 "Chuir Conall na seumanan fo dhleastanas gus cùram a ghabhail air na "
-"beathaichean. Bha dàimh nàdarra aig na seumanan ris na h&#8209;iseanan "
+"beathaichean. Bha dàimh nàdarra aig na seumanan-sìthe ris na h&#8209;iseanan "
 "iolaire-leòmhainn a bha ro bheag fhathast ach am b’ urrainn dhaibh duine a "
 "ghiùlan."

@ -4131,7 +4131,7 @@ msgid ""
 msgstr ""
 "Cron oirnn, nach do rinn? ’S ann gun robh mi fhìn an làthair nuair a dhiùlt "
 "na sìthichean an caidreachas againn a choileanadh. Chaidh iomadh troich a "
-"mharbhadh agus cha do rinn na gealtairean sìthiche dad gus cobhair a thoirt "
+"mharbhadh agus cha do rinn na gealtairean-sìthe dad gus cobhair a thoirt "
 "dhuinn!"

 #. [message]: speaker=Kalenz
@ -4140,8 +4140,8 @@ msgid ""
 "You go too far! I am Kalenz, a mighty elvish lord! How dare such as you, "
 "sniveling in his tunnel, call me a coward?"
 msgstr ""
-"Chaidh thu thar na còrach! ’S mise Calans, mòr-thighearna nan sìthichean! Na "
-"gabh ort ainm a’ ghealtair a thoirt orm, a smùcair nan tunailean!"
+"Chaidh thu thar na còrach! ’S mise Calans, mòr-thighearna-sìthe! Na gabh ort "
+"ainm a’ ghealtair a thoirt orm, a smùcair nan tunailean!"

 #. [message]: speaker=Delfador
 #: data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg:346
@ -5142,6 +5142,8 @@ msgid ""
 "That noise was made by no troll! What manner of beast makes its den in these "
 "forsaken caves?"
 msgstr ""
+"Chan e athach a chuala sinn! Dè seòrsa a bhèist a ghabhadh còmhnaidh sna h-"
+"uamhan trèigte seo?"

 #. [message]: race=merman
 #. Comic relief
@ -5151,6 +5153,9 @@ msgid ""
 "places are anathema to my kind. Whatever monsters may abide in these depths, "
 "are known not to my kin."
 msgstr ""
+"Chan eil fios agam, a thighearna. Tha àitichean cho theth tioram às aonais "
+"aibhne glè mhallaichte dha mo leithid. Chan eil sinne eòlach air gin dhe na "
+"h-uilebheistean a tha a’ fuireach san doimhne seo."

 #. [message]: race=merman
 #. Comic relief
@ -5161,6 +5166,11 @@ msgid ""
 "gladly die for you, milord, but I would that you didn't spend my life for "
 "nothing, looking for another dwarf to rescue when there is none."
 msgstr ""
+"A bharrachd air sin, a thighearna neònaich, chan eil càil a dh’fhios agam "
+"carson a tha mi ann an uamh. Cha do thill duine-mara beò o na h-uamhan fon "
+"bheinn seo a-riamh. Tha mi deiseil airson bàs fhaighinn às ur leithid, a "
+"thighearna ach b’ fhearr leam gun a bhith a’ cosg mo bheatha gun adhbhar ag "
+"amas air troich nach eil ann a shàbhaladh."

 #. [message]: race=dwarf
 #. "sowl" is a rare word synonymous with "sully", meaning "contaminate". 
@ -5173,6 +5183,11 @@ msgid ""
 "sowling the air? I beseech that we not tarry ’ere any more than we ha’ to, "
 "lest the forming abysses claim us."
 msgstr ""
+"A thighearna Chonaill, chan e beòthach a rinn an fhuaim ud. Seo mac-talla na "
+"cloiche fhèin a’ tuiteam fodhainn. Nach eil sibh a’ faireachdainn mar a tha "
+"an teas nas cruaidhe oirnn a-nis? Nach eil an luaithre duslach cruaidh air "
+"ur sgamhanan? Tha mi a’ guidhe nach fuirich sinn an-seo nas fhaide na "
+"dh’fheumas sinn mus tuit sinn dha aibheis ùr."

 #. [message]: type=Arch Mage,Great Mage,Silver Mage
 #. "din" means "loud noise". It refers to an ambient sound of collapsing cave walls.
@ -5183,6 +5198,11 @@ msgid ""
 "this cave even now. We must tread with caution, for the very ground we stand "
 "on may turn against us."
 msgstr ""
+"A phrionnsa Chonaill, chan e beòthach a dh’adhbharaich an fhuaim ud. B’ e "
+"fuaim na talmhainn fhèin a bh’ ann a tha a’ goil timcheall oirnn ’s a’ "
+"tighinn on teine ’s làbha a tha a’ briseadh a-steach don uamh seo. Feumaidh "
+"sinn leantainn air adhart gu cùramach air eagal gun seas an talamh fhèin "
+"’nar n-aghaidh."

 #. [message]: id=Li'sar
 #: data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg:681
@ -5192,6 +5212,10 @@ msgid ""
 "the Sceptre and return to the surface with haste, before the lava under our "
 "feet consumes us."
 msgstr ""
+"A Chonaill, saoilidh mi gun do thuit an làr. Thugte rabhadh dhomh a thaobh "
+"nan cunnartan seo nuair an do dh’ullaich mi an triall agam. Na fuiricheamaid "
+"an-seo, gheibheamaid an slat-rìoghail agus tilleamaid ghan uachdar gun dàil "
+"mus faigh an làbha fo ar casan greim oirnn."

 #. [message]: speaker=Delfador
 #: data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg:697
@ -5610,7 +5634,7 @@ msgid ""
 "the most direct route to your homeland and escape the grasp of the "
 "Northerner armies that swarm the wilderness."
 msgstr ""
-"A thighearna shìthiche, is mise an ceannard. Ghabh mi comhairle bhon t&#8209;"
+"A thighearna-shìthe, is mise an ceannard. Ghabh mi comhairle bhon t&#8209;"
 "sluagh-mhara agus saoilidh iad gun lorg iad slighe sìos na h&#8209;aibhne "
 "thar an easa. Gabhaidh sinn an rathad dìreach do ur dùthaich agus teichidh "
 "sinn bho ghreim feachdan nan tuathach a bhios pailt san fhàsach."
@ -5736,9 +5760,9 @@ msgid ""
 "vanquish some beast or other."
 msgstr ""
 "Cha chreid mi nach robh le Iola’ailion, marasgal na coille e. Chaidh geas a "
-"chur air mar asgaidh leis na caraidean sìthiche deasach agaibh. Rinn e "
-"tadhal air an dachaighean mar teachdaire nan sìthichean tuathail agus chuir "
-"e às dha bhèist no dhà às an leth."
+"chur air mar asgaidh leis na caraidean-sìthe deasach agaibh. Rinn e tadhal "
+"air an dachaighean mar teachdaire nan sìthichean tuathail agus chuir e às "
+"dha bhèist no dhà às an leth."

 #. [message]: speaker=Konrad
 #: data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg:132
@ -6229,7 +6253,7 @@ msgid ""
 msgstr ""
 "Chan eil ùine air fhàgail dhuinn airson tilleadh ann an dòigh sam bith! "
 "Feumaidh sinn greasadh oirnn agus dachaidh nan sìthichean tuathach a thoirt "
-"oirnn ach am bruidhinn sinn ris na caidreabhaich sìthiche againn."
+"oirnn ach am bruidhinn sinn ris na caidreabhaich-shìthe againn."

 #. [message]: speaker=Konrad
 #: data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg:288
@ -7245,17 +7269,13 @@ msgstr "Stadaibh!"

 #. [message]: speaker=Bona-Melodia
 #: data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg:251
-#, fuzzy
-#| msgid ""
-#| "Milord Kalenz! My apologies. I mistook him for one of those foul "
-#| "lizardmen. How came you to be traveling such paths?"
 msgid ""
 "Milord Kalenz! My apologies. I mistook you for one of those foul lizardmen. "
 "How came you to be traveling such paths?"
 msgstr ""
 "A thighearna Chalains! Gabhaidh mo leisgeul. Shaoilinn gur e fear dhe na "
-"laghairtean olca a bhiodh ann. Carson a tha sibh a’ siubhal nan rathaidean "
-"seo?"
+"laghairtean olca a bhiodh annaibh. Carson a tha sibh a’ siubhal nan "
+"rathaidean seo?"

 #. [message]: speaker=Kalenz
 #: data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg:256
@ -7311,12 +7331,10 @@ msgstr ""

 #. [message]: speaker=Kalenz
 #: data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg:296
-#, fuzzy
-#| msgid "Then we must hurry. Stand fast, we will send reinforcements."
 msgid "Then we must hurry. Stand fast! We will send reinforcements."
 msgstr ""
-"Feumaidh sinn greasadh oirnn mar-thà. Cumaibh a’ dol, cuiridh sinn "
-"foirlionadh chuibh."
+"Feumaidh sinn greasadh oirnn mar-thà. Cumaibh a’ dol! Cuiridh sinn "
+"foirlionadh dhuibh."

 #. [message]: speaker=Kalenz
 #: data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg:303
@ -9065,12 +9083,6 @@ msgstr "Bana-phrionnsa a’ bhlàir"

 #. [unit_type]: id=Battle Princess, race=human
 #: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:28
-#, fuzzy
-#| msgid ""
-#| "A noble by birth, the Princess has learnt swordplay with the greatest "
-#| "generals, and battle tactics with the greatest sages, making her both a "
-#| "great combatant and a leader. Now battle-hardened and strong of will, she "
-#| "can aid those around her in the art of combat."
 msgid ""
 "A noble by birth, the Princess has learnt swordplay with the greatest "
 "generals and battle tactics with the greatest sages, making her both a great "
@ -9663,16 +9675,3 @@ msgstr ""
 "Air a theicheadh dha Choille Aidhean taobh thall crìochan iar-dheas "
 "Bheasnaid, dh’àraich Deilfeadar Conall fo dhìon nan sìthichean, làn truais "
 "mun rìoghladh uabhasach a thug Aisebheir dhan dùthaich …"
-
-#~ msgid ""
-#~ "A noble by birth, the Princess has learnt swordplay with the greatest "
-#~ "generals and battle tactics with the greatest sages, making her both a "
-#~ "great combatant and a leader. Now battle-hardened and strong of will, she "
-#~ "can now aid those around her in the art of combat."
-#~ msgstr ""
-#~ "’S e maighdeann uasail a tha sa bhana-phrionnsa agus dh’ionnsaich i "
-#~ "sabaid leis a’ chlaidheamh bho na cinn-armailt as cliùmhoire agus ro-"
-#~ "innleachd a’ bhlàir bho na sàr-eòlaichean. Mar sin, tha i fìor mhath air "
-#~ "sabaid ’s air stiùireadh nan saighdearan. ’S urrainn dhi taic a thoirt "
-#~ "dhan fheadhainn mu timcheall bhon a tha i eòlach is seasmhach air a’ "
-#~ "bhlàr."
--- a/po/wesnoth-lib/gd.po
+++ b/po/wesnoth-lib/gd.po
@ -1004,22 +1004,22 @@ msgstr "Baile teanta"
 #. [terrain_type]: id=orcish_village
 #: data/core/terrain.cfg:1507
 msgid "Orcish Village"
-msgstr "Baile Deamhain"
+msgstr "Baile deamhain"

 #. [terrain_type]: id=orcish_snow_village
 #: data/core/terrain.cfg:1520
 msgid "Snowy Orcish Village"
-msgstr "Baile Deamhain sneachdach"
+msgstr "Baile deamhain sneachdach"

 #. [terrain_type]: id=elven_snow_village
 #: data/core/terrain.cfg:1535
 msgid "Snowy Elven Village"
-msgstr "Baile Sìthiche sneachdach"
+msgstr "Baile-sìthe sneachdach"

 #. [terrain_type]: id=elven_village
 #: data/core/terrain.cfg:1548
 msgid "Elven Village"
-msgstr "Baile Sìthiche"
+msgstr "Baile-sìthe"

 #. [terrain_type]: id=human_village
 #: data/core/terrain.cfg:1563
@ -1039,7 +1039,7 @@ msgstr "Tobhta bhothain"
 #. [terrain_type]: id=city_village
 #: data/core/terrain.cfg:1602
 msgid "Human City"
-msgstr "Baile a’ Chinne-daonna"
+msgstr "Baile a’ chinne-daonna"

 #. [terrain_type]: id=windmill_village
 #: data/core/terrain.cfg:1615
@ -1049,12 +1049,12 @@ msgstr "Baile muilinn-ghaoithe"
 #. [terrain_type]: id=city_village_wno
 #: data/core/terrain.cfg:1628
 msgid "Snowy Human City"
-msgstr "Baile a’ Chinne-daonna sneachdach"
+msgstr "Baile a’ chinne-daonna sneachdach"

 #. [terrain_type]: id=city_village_ruin
 #: data/core/terrain.cfg:1641
 msgid "Ruined Human City"
-msgstr "Tobhta baile a’ Chinne-daonna"
+msgstr "Tobhta baile a’ chinne-daonna"

 #. [terrain_type]: id=hill_village
 #: data/core/terrain.cfg:1654
@ -1079,7 +1079,7 @@ msgstr "Baile tropaigeach"
 #. [terrain_type]: id=drake_village
 #: data/core/terrain.cfg:1706
 msgid "Drake Village"
-msgstr "Baile Dràic"
+msgstr "Baile dràic"

 #. [terrain_type]: id=underground_village
 #: data/core/terrain.cfg:1721
@ -1089,7 +1089,7 @@ msgstr "Baile uamha"
 #. [terrain_type]: id=dwarven_village
 #: data/core/terrain.cfg:1734
 msgid "Dwarven Village"
-msgstr "Baile Troiche"
+msgstr "Baile troiche"

 #. [terrain_type]: id=hut_village
 #: data/core/terrain.cfg:1747
@ -1124,7 +1124,7 @@ msgstr "Baile boglaich"
 #. [terrain_type]: id=mermen-village
 #: data/core/terrain.cfg:1827
 msgid "Merfolk Village"
-msgstr "Baile Sluaigh-mhara"
+msgstr "Baile sluaigh-mhara"

 #. [terrain_type]: id=mermen-village
 #: data/core/terrain.cfg:1828
@ -1200,32 +1200,32 @@ msgstr "Caisteal"
 #. [terrain_type]: id=orcish_fort
 #: data/core/terrain.cfg:1898
 msgid "Orcish Castle"
-msgstr "Caisteil Deamhain"
+msgstr "Caisteil deamhain"

 #. [terrain_type]: id=snow_orcish_fort
 #: data/core/terrain.cfg:1910
 msgid "Snowy Orcish Castle"
-msgstr "Caisteal Deamhain sneachdach"
+msgstr "Caisteal deamhain sneachdach"

 #. [terrain_type]: id=human_castle
 #: data/core/terrain.cfg:1922
 msgid "Human Castle"
-msgstr "Caisteal a’ Chinne-daonna"
+msgstr "Caisteal a’ chinne-daonna"

 #. [terrain_type]: id=snow_castle
 #: data/core/terrain.cfg:1934
 msgid "Snowy Human Castle"
-msgstr "Caisteal a’ Chinne-daonna sneachdach"
+msgstr "Caisteal a’ chinne-daonna sneachdach"

 #. [terrain_type]: id=elven_castle
 #: data/core/terrain.cfg:1945
 msgid "Elven Castle"
-msgstr "Caisteal Sìthiche"
+msgstr "Caisteal-sìthe"

 #. [terrain_type]: id=elven_castle_ruin
 #: data/core/terrain.cfg:1957
 msgid "Elven Castle Ruin"
-msgstr "Tobhta caisteil Sìthiche"
+msgstr "Tobhta caisteil-shìthe"

 #. [terrain_type]: id=dwarven_castle
 #: data/core/terrain.cfg:1969
@ -1239,22 +1239,22 @@ msgstr "Caisteal Troiche"
 #: data/core/terrain.cfg:1980 data/core/terrain.cfg:1992
 #: data/core/terrain.cfg:2005 data/core/terrain.cfg:2030
 msgid "Ruined Castle"
-msgstr "Tobhta chaisteil"
+msgstr "Tobhta caisteil"

 #. [terrain_type]: id=ruin
 #: data/core/terrain.cfg:1981
 msgid "Ruined Human Castle"
-msgstr "Tobhta chaisteal a’ Chinne-daonna"
+msgstr "Tobhta caisteil a’ chinne-daonna"

 #. [terrain_type]: id=sunkenruin
 #: data/core/terrain.cfg:1993
 msgid "Sunken Human Ruin"
-msgstr "Tobhta bàthte a’ Chinne-daonna"
+msgstr "Tobhta bàthte a’ chinne-daonna"

 #. [terrain_type]: id=swampruin
 #: data/core/terrain.cfg:2006
 msgid "Swamp Human Ruin"
-msgstr "Tobhta boglaich a’ Chinne-daonna"
+msgstr "Tobhta boglaich a’ chinne-daonna"

 #. [terrain_type]: id=sand_castle
 #: data/core/terrain.cfg:2019
@ -1269,7 +1269,7 @@ msgstr "Tobhta caisteal an fhàsaich"
 #. [terrain_type]: id=troll_encampment
 #: data/core/terrain.cfg:2043
 msgid "Troll Encampment"
-msgstr "Campachadh Athach"
+msgstr "Campachadh athach"

 #. [terrain_type]: id=aquatic_camp
 #: data/core/terrain.cfg:2055
@ -1328,7 +1328,7 @@ msgstr "Daingean"
 #. [terrain_type]: id=orcish_keep
 #: data/core/terrain.cfg:2135
 msgid "Orcish Keep"
-msgstr "Daingean Deamhain"
+msgstr "Daingean deamhain"

 #. [terrain_type]: id=snow_orcish_keep
 #: data/core/terrain.cfg:2148
@ -1338,27 +1338,27 @@ msgstr "Daingean deamhain sneachdach"
 #. [terrain_type]: id=human_keep
 #: data/core/terrain.cfg:2161
 msgid "Human Castle Keep"
-msgstr "Daingean a’ Chinne-daonna"
+msgstr "Daingean a’ chinne-daonna"

 #. [terrain_type]: id=snow_keep
 #: data/core/terrain.cfg:2174
 msgid "Snowy Human Castle Keep"
-msgstr "Daingean a’ Chinne-daonna sneachdach"
+msgstr "Daingean a’ chinne-daonna sneachdach"

 #. [terrain_type]: id=elven_keep
 #: data/core/terrain.cfg:2187
 msgid "Elven Castle Keep"
-msgstr "Daingean Sìthiche"
+msgstr "Daingean-sìthe"

 #. [terrain_type]: id=elven_keep_ruin
 #: data/core/terrain.cfg:2200
 msgid "Elven Keep Ruin"
-msgstr "Tobhta daingean Sìthiche"
+msgstr "Tobhta daingein-shìthe"

 #. [terrain_type]: id=dwarven_keep
 #: data/core/terrain.cfg:2213
 msgid "Dwarven Castle Keep"
-msgstr "Daingean Troiche"
+msgstr "Daingean troiche"

 #. [terrain_type]: id=ruined_keep
 #. [terrain_type]: id=sunken_keep
@ -1367,22 +1367,22 @@ msgstr "Daingean Troiche"
 #: data/core/terrain.cfg:2225 data/core/terrain.cfg:2238
 #: data/core/terrain.cfg:2251 data/core/terrain.cfg:2277
 msgid "Ruined Keep"
-msgstr "Tobhta dhaingein"
+msgstr "Tobhta daingein"

 #. [terrain_type]: id=ruined_keep
 #: data/core/terrain.cfg:2226
 msgid "Ruined Human Castle Keep"
-msgstr "Tobhta daingein a’ Chinne-daonna"
+msgstr "Tobhta daingein a’ chinne-daonna"

 #. [terrain_type]: id=sunken_keep
 #: data/core/terrain.cfg:2239
 msgid "Sunken Human Castle Keep"
-msgstr "Daingean a’ Chinne-daonna bàthte"
+msgstr "Daingean a’ chinne-daonna bàthte"

 #. [terrain_type]: id=swamp_keep
 #: data/core/terrain.cfg:2252
 msgid "Swamp Human Castle Keep"
-msgstr "Daingean boglaich a’ Chinne-daonna"
+msgstr "Daingean boglaich a’ chinne-daonna"

 #. [terrain_type]: id=desert_keep
 #: data/core/terrain.cfg:2265
@ -1402,7 +1402,7 @@ msgstr "Daingean campachaidh uisge"
 #. [terrain_type]: id=troll_campkeep
 #: data/core/terrain.cfg:2304
 msgid "Troll Encampment Keep"
-msgstr "Daingean campachaidh Athaich"
+msgstr "Daingean campachaidh athaich"

 #. [terrain_type]: id=merman_castlekeep
 #: data/core/terrain.cfg:2317
@ -1768,9 +1768,9 @@ msgstr ""
 "sreap thairis air cnapan-starra gu tric. Seo as adhbhar gun toir iad "
 "buannachd dìona mhòr don mhòrchuid a dh’aonadan ach cuiridh iad fìor "
 "ghrabadh orra cuideachd. Chan urrainn do mharcaichean fiù ’s faighinn air an "
-"tìr seo ach marcaichean sìthiche is marcaichean madaidh nam bòcan. Buinidh "
-"an dà chuid troichean is athaich do na beanntan is tha e furasta dhaibh "
-"siubhal annta.\n"
+"tìr seo ach marcaichean-sìthe is marcaichean madaidh nam bòcan. Buinidh an "
+"dà chuid troichean is athaich do na beanntan is tha e furasta dhaibh siubhal "
+"annta.\n"
 "\n"
 "Tha dìon de 60% aig a’ mhòrchuid a dh’aonadan air beanntan ach gheibh "
 "troichean 70%."
@ -2401,7 +2401,7 @@ msgstr "Dochann bunasach"
 #. [grid]
 #: data/gui/window/attack_predictions.cfg:84
 msgid "Time of day modifier"
-msgstr "Atharraichear àm an latha"
+msgstr "Atharraichear ama dhen latha"

 #. [grid]
 #: data/gui/window/attack_predictions.cfg:85
@ -4005,7 +4005,7 @@ msgstr "Àm tòiseachaidh air thuaiream"
 #. [toggle_button]: id=random_start_time
 #: data/gui/window/mp_create_game.cfg:406
 msgid "Randomize the starting time of day"
-msgstr "Tòisich le àm an latha air thuaiream"
+msgstr "Tòisich le àm dhen latha air thuaiream"

 #. [toggle_button]: id=time_limit
 #: data/gui/window/mp_create_game.cfg:434
@ -5306,10 +5306,8 @@ msgstr "Ais-ghairm aonad"

 #. [button]: id=rename
 #: data/gui/window/unit_recall.cfg:393
-#, fuzzy
-#| msgid "Rename Unit"
 msgid "Rename"
-msgstr "Ath-ainmich aonad"
+msgstr "Thoir ainm ùr air"

 #. [button]: id=dismiss
 #: data/gui/window/unit_recall.cfg:405
@ -5413,10 +5411,8 @@ msgid "The maximum text width is less than 1."
 msgstr "Tha an leud as motha dhe theacsa nas lugha na 1."

 #: src/font/text.cpp:761
-#, fuzzy
-#| msgid "The text contains invalid markup: "
 msgid "The text contains invalid Pango markup: "
-msgstr "Tha markup mì-dhligheach san teacsa seo: "
+msgstr "Tha markup Pango mì-dhligheach san teacsa seo: "

 #. TRANSLATORS: Formats a two-element conjunctive list.
 #: src/formula/string_utils.cpp:251
@ -5610,16 +5606,12 @@ msgid "addons_order^Type ($order)"
 msgstr "Seòrsa ($order)"

 #: src/gui/dialogs/addon/manager.cpp:229
-#, fuzzy
-#| msgid "addons_order^Last updated ($order)"
 msgid "addons_order^Last updated ($datelike_order)"
-msgstr "An t-atharrachadh mu dheireadh ($order)"
+msgstr "An t-atharrachadh mu dheireadh ($datelike_order)"

 #: src/gui/dialogs/addon/manager.cpp:232
-#, fuzzy
-#| msgid "addons_order^First uploaded ($order)"
 msgid "addons_order^First uploaded ($datelike_order)"
-msgstr "A’ chiad luchdadh suas ($order)"
+msgstr "A’ chiad luchdadh suas ($datelike_order)"

 #: src/gui/dialogs/addon/manager.cpp:261 src/gui/widgets/addon_list.cpp:103
 msgid "addon_state^Not installed"
@ -5683,21 +5675,21 @@ msgstr "Chan eil fhios"

 #: src/gui/dialogs/addon/manager.cpp:363
 msgid "ascending"
-msgstr ""
+msgstr "a’ dìreadh"

 #. TRANSLATORS: Sorting order of dates, oldest first
 #: src/gui/dialogs/addon/manager.cpp:365
 msgid "oldest to newest"
-msgstr ""
+msgstr "sean gu ùr"

 #: src/gui/dialogs/addon/manager.cpp:368
 msgid "descending"
-msgstr ""
+msgstr "a’ teàrnadh"

 #. TRANSLATORS: Sorting order of dates, newest first
 #: src/gui/dialogs/addon/manager.cpp:370
 msgid "newest to oldest"
-msgstr ""
+msgstr "ùr gu sean"

 #: src/gui/dialogs/addon/manager.cpp:388 src/gui/dialogs/chat_log.cpp:420
 #: src/gui/dialogs/game_cache_options.cpp:105
@ -5978,10 +5970,8 @@ msgid "Version: "
 msgstr "Tionndadh: "

 #: src/gui/dialogs/game_load.cpp:389
-#, fuzzy
-#| msgid "Modifications:"
 msgid "Modifications: "
-msgstr "Atharraichean:"
+msgstr "Atharraichean: "

 #: src/gui/dialogs/game_stats.cpp:78
 msgid "controller^AI"
@ -6117,12 +6107,12 @@ msgstr "A’ luchdadh a-nuas dàta an lobaidh"
 #: src/gui/dialogs/lua_interpreter.cpp:690
 msgid "The lua console can only be used in debug mode! (Run ':debug' first)"
 msgstr ""
+"Chan urrainn dhut consoil Lua a ruith ach sa mhodh dì-bhugachaidh! (Ruith “:"
+"debug” an toiseach)"

 #: src/gui/dialogs/lua_interpreter.cpp:691
-#, fuzzy
-#| msgid "Lua Console"
 msgid "lua console"
-msgstr "Consoil Lua"
+msgstr "consoil Lua"

 #: src/gui/dialogs/multiplayer/lobby.cpp:106
 msgid "Selected Game"
@ -6226,23 +6216,17 @@ msgid "Observers not allowed"
 msgstr "Chan eil amhairc ceadaichte"

 #: src/gui/dialogs/multiplayer/lobby.cpp:797
-#, fuzzy
-#| msgid "Lobby"
 msgid "lobby"
-msgstr "Lobaidh"
+msgstr "lobaidh"

 #: src/gui/dialogs/multiplayer/lobby.cpp:957
-#, fuzzy
-#| msgid ""
-#| "Something is wrong with the addon version check database supporting the "
-#| "multiplayer lobby. Please report this at http://bugs.wesnoth.org."
 msgid ""
 "Something is wrong with the addon version check database supporting the "
 "multiplayer lobby. Please report this at https://bugs.wesnoth.org."
 msgstr ""
 "Tha rudeigin cearr air an stòr-dàta a dhearbhas na tionndaidhean gus taic a "
 "chur ris an lobaidh ioma-chluicheadair. Dèan aithris air a’ bhuga seo air "
-"http://bugs.wesnoth.org."
+"https://bugs.wesnoth.org."

 #: src/gui/dialogs/multiplayer/mp_alerts_options.cpp:131
 msgid ""
@ -6349,10 +6333,8 @@ msgstr "falamh"

 #: src/gui/dialogs/multiplayer/mp_join_game.cpp:253
 #: src/gui/dialogs/multiplayer/mp_staging.cpp:109
-#, fuzzy
-#| msgid "Quit game"
 msgid "this game"
-msgstr "Fàg an geama"
+msgstr "an geama seo"

 #: src/gui/dialogs/multiplayer/mp_join_game.cpp:365
 #: src/gui/dialogs/multiplayer/mp_staging.cpp:168
@ -6788,7 +6770,7 @@ msgstr "Tagh/Gluais/Thoir ionnsaigh"

 #: src/hotkey/hotkey_command.cpp:78
 msgid "Touch"
-msgstr ""
+msgstr "Suathadh"

 #: src/hotkey/hotkey_command.cpp:79
 msgid "Animate Map"
@ -7655,9 +7637,3 @@ msgstr ""
 "Chaidh an iuchair “$deprecated_key” ath-ainmeachadh gu “$key|.” Thèid gach "
 "taic ri “$deprecated_key” a thoirt air falbh leis an tionndadh "
 "$removal_version."
-
-#~ msgid "asc"
-#~ msgstr "a’ dìreadh"
-
-#~ msgid "desc"
-#~ msgstr "a’ teàrnadh"
--- a/po/wesnoth-multiplayer/gd.po
+++ b/po/wesnoth-multiplayer/gd.po
@ -122,7 +122,7 @@ msgstr "Iomlan: <b>%d</b>"
 #. [lua]: f
 #: data/multiplayer/eras.lua:93
 msgid "Sides %s and %d are tied."
-msgstr ""
+msgstr "Geama ionnann eadar taobh %s is taobh %d."

 #. [lua]: f
 #: data/multiplayer/eras.lua:95
@ -795,7 +795,7 @@ msgstr ""
 "ach an teicheadh iad, ach cha ghluaiseadh esan. Fhad ’s a bha an creutair a’ "
 "teannadh air, dh’èigh e na faclan deireannach aige: A mhadaidh mhaith, a "
 "bheil do chasan dèanta dhe chlach?!\n"
-"(sgrìobhte le creachadair sìthiche)"
+"(sgrìobhte le creachadair-sìthe)"

 #. [side]
 #: data/multiplayer/scenarios/2p_Caves_of_the_Basilisk.cfg:154
@ -816,8 +816,8 @@ msgid ""
 "for vengeance, Rah Ihn Mar began the hunt..."
 msgstr ""
 "Thàinig Rah Ihn Mar, gaisgeach nan Cnoc Loisgte, dha sgìre Loch Ruaskkolain "
-"an tòir air a’ ghaisgeach shìthiche Terowydlithrol a bha cliùiteach am measg "
-"nan sìthichean mar ‘Chreach nan Dràgon.’ Bhathar ag ràdh gun do mharbh "
+"an tòir air a’ ghaisgeach-sìthe Terowydlithrol a bha cliùiteach am measg nan "
+"sìthichean mar ‘Chreach nan Dràgon.’ Bhathar ag ràdh gun do mharbh "
 "Terowydlithrol dràgon teine a chuireadh baile nan sìthichean fo bhagairt is "
 "gun do thòisich e ‘frith-ionnsaigh’ far an deach 37 dràic a chasgradh a bha "
 "a’ campachadh ann an gleann faisg air is a shaoilte a bhith ’nan luchd-"
@ -925,7 +925,7 @@ msgstr ""
 "mhothaicheadh e gun robh am biast ann. Tha a chruth cloiche ’na sheasamh an-"
 "sin an-diugh fhathast, ’ga bhlàthachadh le dearrsadh na grèine fo na speuran "
 "fosgailte. Fhuair e a mhiann as motha.\n"
-"(sgrìobhte le creachadair sìthiche)"
+"(sgrìobhte le creachadair-sìthe)"

 #. [side]
 #: data/multiplayer/scenarios/2p_Caves_of_the_Basilisk.cfg:201
@ -988,14 +988,14 @@ msgstr ""
 "Bhiodh Riolhon aig na nagaidhean air an gaisgeach treun seo. Latha a bha "
 "seo, chuala e mu ulaidh seann-sgeulach a chaidh air chall sna h-uamhan "
 "uisgeach seo – sleagh le ceann air a dhèanamh à fiacail Chak’kso Ney’yks, "
-"seann rìgh-nathair a chaidh a mharbhadh leis a’ ghaisgeach sìthiche "
-"Eloralduil bho chionn fhada. A rèir na seann-sgeulachd, bhiodh an arm ’na "
-"laighe air bonn an dearbh locha seo (Loch Ruaskkolain air ainmeachadh a rèir "
-"nathrach mara cliùitiche a b’ àbhaist a bhith a’ fuireach ann). An dèidh "
-"ullachadh airson sabaide an aghaidh na nathrach, thachair Riolhon ri dà rud "
-"air nach robh e an dùil. B’ e cruth cloiche Ruaskkolain a’ chiad fhear "
-"dhiubh. An dàrna fear, ’s e gun robh Chak’kso Ney’yks glè bheò fhathast is "
-"leis a h-uile fiacail aige cuideachd, gu h-iongantach.\n"
+"seann rìgh-nathair a chaidh a mharbhadh leis a’ ghaisgeach-sìthe Eloralduil "
+"bho chionn fhada. A rèir na seann-sgeulachd, bhiodh an arm ’na laighe air "
+"bonn an dearbh locha seo (Loch Ruaskkolain air ainmeachadh a rèir nathrach "
+"mara cliùitiche a b’ àbhaist a bhith a’ fuireach ann). An dèidh ullachadh "
+"airson sabaide an aghaidh na nathrach, thachair Riolhon ri dà rud air nach "
+"robh e an dùil. B’ e cruth cloiche Ruaskkolain a’ chiad fhear dhiubh. An "
+"dàrna fear, ’s e gun robh Chak’kso Ney’yks glè bheò fhathast is leis a h-"
+"uile fiacail aige cuideachd, gu h-iongantach.\n"
 "(sgrìobhte le Paterson)"

 #. [unit]
@ -2060,12 +2060,6 @@ msgstr "4cl – Crois Iosair"

 #. [multiplayer]: id=multiplayer_Isars_Cross
 #: data/multiplayer/scenarios/4p_Isars_Cross.cfg:9
-#, fuzzy
-#| msgid ""
-#| "A very small 2 vs. 2 map. Close quarters fighting means the successful "
-#| "rotation of units and planning of moves is important. Teams set for "
-#| "players 1+4 vs. 2+3 (northeast vs. southwest). Designed for 75 starting "
-#| "gold, 20 villages."
 msgid ""
 "A very small 2 vs. 2 map. Close quarters fighting means the successful "
 "rotation of units and planning of moves is important. Teams set for players "
@ -2074,8 +2068,8 @@ msgid ""
 msgstr ""
 "Mapa 2 an aghaidh 2 glè bheag. Tha sabaid gun mhòran rùm a’ ciallachadh gum "
 "feum thu a’ bhith cùramach le ro-innleachd nan gluasadan is cuairteachadh "
-"nan aonadan. Tha sgiobaidhean ’gan stèidheachadh airson cluicheadair 1 is 4 "
-"an aghaidh 2 is 3 (ear-thuath an aghaidh iar-dheas). Air a dhealbhadh airson "
+"nan aonadan. Tha sgiobaidhean ’gan stèidheachadh airson cluicheadair 1 ⁊ 4 "
+"an aghaidh 2 ⁊ 3 (ear-thuath an aghaidh iar-dheas). Air a dhealbhadh airson "
 "75 bonn òir tòiseachaidh, 20 baile."

 #. [side]
@ -2159,17 +2153,13 @@ msgstr "4cl – Abhainn Lorais"

 #. [multiplayer]: id=multiplayer_Loris_River
 #: data/multiplayer/scenarios/4p_Loris_River.cfg:9
-#, fuzzy
-#| msgid ""
-#| "2 vs. 2 map centered around a river with keeps in opposite corners. "
-#| "Designed for players 1+4 vs. 2+3. There are 28 villages."
 msgid ""
 "2 vs. 2 map centered around a river with keeps in opposite corners. Designed "
 "for players 1 &amp; 4 vs. 2 &amp; 3. There are 28 villages."
 msgstr ""
 "Mapa 25x25 is 2 an aghaidh 2 air a shuidheachadh mu abhainn le daingnean ann "
-"an oiseanan mu choinneamh. Air a dhealbhadh airson cluicheadairean 1 is 4 an "
-"aghaidh 2 is 3. Tha 28 bailtean ann."
+"an oiseanan mu choinneamh. Air a dhealbhadh airson cluicheadairean 1 ⁊ 4 an "
+"aghaidh 2 ⁊ 3. Tha 28 bailtean ann."

 #. [multiplayer]: id=multiplayer_4p_Morituri
 #: data/multiplayer/scenarios/4p_Morituri.cfg:5
@ -2193,18 +2183,14 @@ msgstr " Mholamaid gun suidhich thu òr bhailtean air 2, 28 bailtean."

 #. [multiplayer]: id=multiplayer_Paths_of_Daggers
 #: data/multiplayer/scenarios/4p_Paths_of_Daggers.cfg:9
-#, fuzzy
-#| msgid ""
-#| "A 2 vs. 2 map with 5 separate paths of engagement. Balanced to be played "
-#| "east vs. west (1+4 vs. 2+3), but works well with any teams or FFA."
 msgid ""
 "A 2 vs. 2 map with 5 separate paths of engagement. Balanced to be played "
 "east vs. west (1 &amp; 4 vs. 2 &amp; 3), but works well with any teams or "
 "FFA."
 msgstr ""
 "Mapa 35X27 is 2 an aghaidh 2 le slighean catha fa leth. Chaidh meidh a cho-"
-"dhealbhadh ach an cluich taobh an ear an aghaidh taobh an iar (1 is 4 an "
-"aghaidh 2 is 3) ach obraichidh e cuideachd le sgioba sam bith no a h-uile "
+"dhealbhadh ach an cluich taobh an ear an aghaidh taobh an iar (1 ⁊ 4 an "
+"aghaidh 2 ⁊ 3) ach obraichidh e cuideachd le sgioba sam bith no a h-uile "
 "duine an aghaidh càch a chèile."

 #. [multiplayer]: id=multiplayer_Ruins_of_Terra-Dwelve
--- a/po/wesnoth-tb/gd.po
+++ b/po/wesnoth-tb/gd.po
@ -1,21 +1,20 @@
 # Translators:
 # GunChleoc, 2017
-# GunChleoc <fios@foramnagaidhlig.net>, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.wesnoth.org/\n"
 "POT-Creation-Date: 2018-09-09 08:38 UTC\n"
-"PO-Revision-Date: 2018-05-07 10:58+0100\n"
-"Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
-"Language-Team: Fòram na Gàidhlig\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: GunChleoc, 2017\n"
+"Language-Team: Gaelic, Scottish (https://www.transifex.com/gunchleoc/"
+"teams/12769/gd/)\n"
 "Language: gd\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
 "(n > 2 && n < 20) ? 2 : 3;\n"
-"X-Generator: Virtaal 0.7.1\n"

 #. [campaign]: id=Two_Brothers
 #: data/campaigns/Two_Brothers/_main.cfg:13
--- a/po/wesnoth-tsg/gd.po
+++ b/po/wesnoth-tsg/gd.po
@ -1,21 +1,20 @@
 # Translators:
 # GunChleoc, 2017
-# GunChleoc <fios@foramnagaidhlig.net>, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.wesnoth.org/\n"
 "POT-Creation-Date: 2018-09-09 08:38 UTC\n"
-"PO-Revision-Date: 2018-05-07 10:58+0100\n"
-"Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
-"Language-Team: Fòram na Gàidhlig\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: GunChleoc, 2017\n"
+"Language-Team: Gaelic, Scottish (https://www.transifex.com/gunchleoc/"
+"teams/12769/gd/)\n"
 "Language: gd\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
 "(n > 2 && n < 20) ? 2 : 3;\n"
-"X-Generator: Virtaal 0.7.1\n"

 #. [campaign]: id=The_South_Guard
 #: data/campaigns/The_South_Guard/_main.cfg:9
@ -687,8 +686,6 @@ msgstr "Eucoireach"

 #. [do]
 #: data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg:179
-#, fuzzy
-#| msgid "Criminal"
 msgid "female^Criminal"
 msgstr "Eucoireach"

@ -857,19 +854,14 @@ msgstr ""

 #. [message]: speaker=Deoran
 #: data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg:423
-#, fuzzy
-#| msgid ""
-#| "It grieves me to learn of his death, foolish though he may have been! "
-#| "Now, though, there are more pressing matters. Rise, men of Wesnoth! We "
-#| "must drive these bandits from our city!"
 msgid ""
 "It grieves me to learn of his death, foolish though he may have been! At "
 "least we managed to defeat some of these bandits here and now. What else "
 "happened?"
 msgstr ""
-"’S truagh leam cluinntinn mun chaochladh aige ged a bhiodh e faoin! Co-dhiù, "
-"tha cùisean nas èiginniche againn a-nis. Èirichibh, fhir Bheasnaid! Feumaidh "
-"sinn na spùinneadairean seo fhuadach bho ar baile!"
+"’S truagh leam cluinntinn mun chaochladh aige ged a bhiodh e faoin! Chuir "
+"sinn ruaig air cuid de na spùinneadairean air a char as lugha. Dè eile a "
+"thachair?"

 #. [message]: speaker=Sir Gerrick
 #: data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg:445
@ -976,20 +968,18 @@ msgstr "Ciamar a b’ urrainn dha spùinneadair closaich a ghairm?"

 #. [message]: speaker=Ufes
 #: data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg:645
-#, fuzzy
-#| msgid "The master of the undead is defeated!"
 msgid "The bandits are defeated!"
-msgstr "Chaidh maighstir nan closach a cheannsachadh!"
+msgstr "Chaidh ruaig a chur air na spùinneadairean!"

 #. [message]: speaker=Makees
 #: data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg:655
 msgid "Westin is safe again."
-msgstr ""
+msgstr "Tha Beasdan sàbhailte a-rithist."

 #. [message]: speaker=Makees
 #: data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg:661
 msgid "Westin will soon be safe again."
-msgstr ""
+msgstr "Bidh Beasdan sàbhailte a-rithist a dh’aithghearr."

 #. [message]: speaker=Minister Hylas
 #: data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg:675
@ -1123,8 +1113,8 @@ msgid ""
 "a force strong enough to drive off the bandits before moving Deoran from his "
 "encampment!"
 msgstr ""
-"Feumaidh tu Deoran a ghluasad gu meadhan na torr-chathrach sìthiche. Dèan "
-"cinnteach gun trus thu feachd làidir gu leòr gus ruaig a chur air na "
+"Feumaidh tu Deoran a ghluasad gu meadhan na torr-chathrach nan sìthichean. "
+"Dèan cinnteach gun trus thu feachd làidir gu leòr gus ruaig a chur air na "
 "spùinneadairean mus gluais thu Deoran bho champachadh."

 #. [objective]: condition=win
@ -1492,8 +1482,8 @@ msgid ""
 "foes! Cannot some of your elf friends help us in our struggle?"
 msgstr ""
 "Thuirt sibh gum biodh an gleann seo sàbhailte ach lorg sinn làn nàimhdean "
-"cnàimhnich e! Nach urrainn do chuid de na caraidean sìthiche agaibh cobhair "
-"a thoirt leis an strì againn?"
+"cnàimhnich e! Nach urrainn do chuid de na caraidean-sìthe agaibh cobhair a "
+"thoirt leis an strì againn?"

 #. [message]: speaker=unit
 #: data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg:407
@ -1522,8 +1512,6 @@ msgstr "Lèine-chrios"

 #. [then]
 #: data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg:508
-#, fuzzy
-#| msgid "Elvish Bodyguard"
 msgid "female^Elvish Bodyguard"
 msgstr "Lèine-chrios"

@ -1654,7 +1642,7 @@ msgstr "Gruth"
 #. [unit]: type=Soulless, id=Gerd
 #: data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg:108
 msgid "Gerd"
-msgstr ""
+msgstr "Gerd"

 #. [side]: type=Lich, id=Mal M'Brin
 #: data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg:138
@ -1703,9 +1691,9 @@ msgid ""
 "bow and are deadly with both. They are quick and can hold their own against "
 "just about anything."
 msgstr ""
-"’S e na coilltean dlùtha a th’ anns na dachaighean aig na cathaich "
-"shìthiche. Tha claidheamh is bogha aca is tha iad marbhtach leis an dà "
-"chuid. Tha iad luath is seasaidh iad cha mhòr an aghaidh rud sam bith."
+"’S e na coilltean dlùtha a th’ anns na dachaighean aig na cathaich-shìthe. "
+"Tha claidheamh is bogha aca is tha iad marbhtach leis an dà chuid. Tha iad "
+"luath is seasaidh iad cha mhòr an aghaidh rud sam bith."

 #. [message]: speaker=narrator
 #: data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg:245
@ -1714,7 +1702,7 @@ msgid ""
 "however, heal units next to them every turn. Use them to bolster your "
 "weakening lines and heal wounded soldiers."
 msgstr ""
-"Nì a’ mhòrchuid dhe nàimhdean a chùis air seumanan sìthiche gun chus "
+"Nì a’ mhòrchuid dhe nàimhdean a chùis air seumanan-sìthe gun chus "
 "trioblaide. Co-dhiù, nì iad slànachadh air na h&#8209;aonadan rin taobh gach "
 "cuairt. Cleachd iad gus na loidhnichean air lagachadh agad a neartachadh is "
 "gus saighdearan leòinte a shlànachadh."
@ -1774,7 +1762,7 @@ msgstr "Bàs Ursa Afalais"
 #. There is a second one, a few hexes next to him, the player most likely saw him already.
 #: data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg:382
 msgid "He was not alone."
-msgstr ""
+msgstr "Cha robh e ’na aonar."

 #. [message]: speaker=second_unit
 #. [message]: speaker=Sir Gerrick
@ -1782,10 +1770,8 @@ msgstr ""
 #. Note that masters is in plural.
 #: data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg:425
 #: data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg:433
-#, fuzzy
-#| msgid "The master of the undead is defeated!"
 msgid "The masters of the undead are defeated!"
-msgstr "Chaidh maighstir nan closach a cheannsachadh!"
+msgstr "Chaidh maighstirean nan closach a cheannsachadh!"

 #. [message]: speaker=Minister Hylas
 #: data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg:440
@ -1796,42 +1782,34 @@ msgstr ""
 #. [message]: speaker=Deoran
 #. Note that servants is in plural.
 #: data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg:446
-#, fuzzy
-#| msgid ""
-#| "Surely the undead infestation cannot be dispatched so easily. We have "
-#| "merely destroyed a servant of a far darker master."
 msgid ""
 "Surely the undead infestation cannot be dispatched so easily. We have merely "
 "destroyed servants of a far darker master."
 msgstr ""
 "Chan eil mi an dùil gum faigheamaid cuidhteas de phlàigh nan closach seo cho "
-"furasta sin. Cha do mhill sinn ach sgalag aig maighstir nas duirche buileach."
+"furasta sin. Cha do mhill sinn ach sgalagan aig maighstir nas duirche "
+"buileach."

 #. [message]: speaker=second_unit
 #: data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg:468
 msgid "Two undead leaders have fallen…"
-msgstr ""
+msgstr "Thuit dithis cheannardan nan closach…"

 #. [message]: speaker=Minister Hylas
 #: data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg:472
-#, fuzzy
-#| msgid ""
-#| "Surely the undead infestation cannot be dispatched so easily. We have "
-#| "merely destroyed a servant of a far darker master."
 msgid "Though we have merely destroyed the servants of a far darker master…"
 msgstr ""
-"Chan eil mi an dùil gum faigheamaid cuidhteas de phlàigh nan closach seo cho "
-"furasta sin. Cha do mhill sinn ach sgalag aig maighstir nas duirche buileach."
+"Gidheadh, cha do mhill sinn ach sgalagan aig maighstir nas duirche buileach…"

 #. [message]: speaker=Minister Hylas
 #: data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg:479
 msgid "They were just servants of a far darker master…"
-msgstr ""
+msgstr "Cha b’ e ach sgalagan aig maighstir nas duirche buileach a bh’ annta…"

 #. [message]: speaker=second_unit
 #: data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg:488
 msgid "One less evil in this forest…"
-msgstr ""
+msgstr "Seo aon olc fo nach eil a’ choille a’ fulang tuilleadh…"

 #. [message]: speaker=second_unit
 #: data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg:512
@ -2546,17 +2524,13 @@ msgstr ""

 #. [message]: speaker=narrator
 #: data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg:471
-#, fuzzy
-#| msgid ""
-#| "While the council debated the best course of action, Deoran and Ethiliel "
-#| "prepared to enter the caves under Mebrin’s fortress..."
 msgid ""
 "While the council debated the best course of action, Deoran and Ethiliel "
 "prepared to enter the caves under the fortress..."
 msgstr ""
 "Fhad ’s a bha a’ chomhairle a’ deasbad mu dè am bu chòir dèanamh, dh’ullaich "
-"Deoran is Ethiliel gus briseadh a-steach dha na h&#8209;uamhan fo dhaingean "
-"Mhebrin ..."
+"Deoran is Ethiliel gus briseadh a-steach dha na h&#8209;uamhan fon "
+"daingean..."

 #. [scenario]: id=06b_The_Long_March
 #: data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg:5
@ -2797,8 +2771,8 @@ msgid ""
 "Cavalrymen and Dragoons will be less useful in the caves than soldiers who "
 "fight on foot."
 msgstr ""
-"Cha bhi saighdearan-eachraidh is eachraidhean cho feumail sna h&#8209;uamhan "
-"seo ’s a bhios saighdearan a shabaideas air an dà chois."
+"Cha bhi saighdearan-eachraidh is cath-mharcaich cho feumail sna h&#8209;"
+"uamhan seo ’s a bhios saighdearan a shabaideas air an dà chois."

 #. [message]: speaker=narrator
 #: data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg:290
@ -3034,7 +3008,7 @@ msgid ""
 "touches on mysteries that are not for men to know, human. I bind you never "
 "to speak of it."
 msgstr ""
-"Chan e ach cathaich a th’ annta. Fairichidh a h&#8209;uile sìthiche faileas "
+"Chan e ach cathaich a th’ annta. Fairichidh a h&#8209;uile sìthiche sgàile "
 "an iarrainn ach ’s e milleadh a th’ ann dhan fheadhainn a ghabhas na "
 "slighean as àirde, a’ buntainn dha ar draoidheachd. Ach seo gnothaichean "
 "dìomhair againne nach innis sinn dhan chinne-daonna, a Dhuine. Cuiridh mi fo "
@ -3099,7 +3073,7 @@ msgid ""
 "devouring all we once cherished."
 msgstr ""
 "Is nuair a bhios sinn deiseil leis, dè sna rachadh sinn? Ana-bheatha. "
-"Faileasan acrach a dh’itheas a h&#8209;uile rud a bhiodh dlùth ’nar cridhe "
+"Sgàilean acrach a dh’itheas a h&#8209;uile rud a bhiodh dlùth ’nar cridhe "
 "uair."

 #. [message]: speaker=Ethiliel
@ -3408,7 +3382,7 @@ msgstr ""
 #: data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg:226
 msgid "We, and our elvish allies, have won a great battle against a lich."
 msgstr ""
-"Bhuannaich sinn blàr mòr an aghaidh corp le taic ar caidreabhaich shìthiche."
+"Bhuannaich sinn blàr mòr an aghaidh corp le taic ar caidreabhaich-shìthe."

 #. [message]: role=GarrisonCommander
 #: data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg:231
@ -3416,9 +3390,9 @@ msgid ""
 "Elvish allies? I think you had best make haste to Westin. There are rumors "
 "of trouble with the elves of the Aethenwood."
 msgstr ""
-"Caidreabhaich shìthiche? Saoilidh mi gum bu chòir dhuibh ur casan a thoirt "
-"leibh dha Bheasdan. Tha fathannan ann mu thrioblaid le sìthichean Coille "
-"Aidhean."
+"Caidreabhaich-shìthe, an e? Saoilidh mi gum bu chòir dhuibh ur casan a "
+"thoirt leibh dha Bheasdan. Tha fathannan ann mu thrioblaid le sìthichean "
+"Coille Aidhean."

 #. [scenario]: id=08b_The_Tides_of_War
 #: data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg:5
@ -3737,8 +3711,6 @@ msgstr "Cuir Ethiliel dhan Chraobh Mhòir is dèan parladh ri Ithelden"

 #. [then]
 #: data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg:301
-#, fuzzy
-#| msgid "Disciple of Mebrin"
 msgid "female^Disciple of Mebrin"
 msgstr "Deisciobal Mhebrin"

@ -3813,7 +3785,7 @@ msgstr "spleuchd"
 #. [unit_type]: id=Horseman Commander, race=human
 #: data/campaigns/The_South_Guard/units/Horseman_Commander.cfg:4
 msgid "Horseman Commander"
-msgstr "Ceann-feadhna Marcaiche"
+msgstr "Ceann-feadhna eachraidh"

 #. [unit_type]: id=Horseman Commander, race=human
 #: data/campaigns/The_South_Guard/units/Horseman_Commander.cfg:25
@ -4123,7 +4095,7 @@ msgid ""
 "soon covered their paths day and night, and a thick fog filled the air."
 msgstr ""
 "Stiùir Ethiliel daoine a’ gheàird dheasaich a-steach dhan choille a deas. "
-"Nach b’ fhada mus do chòmhdaich faileasan an slighean oidhche is latha agus "
+"Nach b’ fhada mus do chòmhdaich sgàilean an slighean oidhche is latha agus "
 "mus do lìon ceò tiugh an adhar."

 #. [part]
@ -4156,9 +4128,9 @@ msgid ""
 "winter."
 msgstr ""
 "An dèidh ruaig a chur air Mal M’Brin, thill saighdearan Dheorain is na "
-"caidreabhaich shìthiche aca air an t&#8209;slighe dhachaigh an comhair a "
-"tuath. Nuair a chaidh iad thairis air an Abhainn Duibh a-rithist, bha am "
-"foghar a’ gèilleadh dhan gheamhradh."
+"caidreabhaich-shìthe aca air an t&#8209;slighe dhachaigh an comhair a tuath. "
+"Nuair a chaidh iad thairis air an Abhainn Duibh a-rithist, bha am foghar a’ "
+"gèilleadh dhan gheamhradh."

 #. [part]
 #: data/campaigns/The_South_Guard/utils/sg_story.cfg:79
@ -4202,9 +4174,9 @@ msgid ""
 msgstr ""
 "Mu dheireadh thall, dh’èirich a’ ghrian air an fhàire is thug a gathan anail "
 "ùr dha na dìonadairean claoidhte Bheasdain. Chualas mac-talla èighich mhòir "
-"air feadh a’ ghlinne fhad ’s a bhrùth fir a’ gheàird dheasaich na nàimhdean "
-"sìthiche aca far nam ballachan. Gu h&#8209;obann, bha am blàr ’ga "
-"chòmhdachadh le mòr-cheò ..."
+"air feadh a’ ghlinne fhad ’s a bhrùth fir a’ gheàird dheasaich na nàimhdean-"
+"sìthe aca far nam ballachan. Gu h&#8209;obann, bha am blàr ’ga chòmhdachadh "
+"le mòr-cheò ..."

 #. [part]
 #: data/campaigns/The_South_Guard/utils/sg_story.cfg:108
--- a/po/wesnoth-tutorial/gd.po
+++ b/po/wesnoth-tutorial/gd.po
@ -539,12 +539,12 @@ msgstr ""
 "<b>Trus</b>. Thoir an aire nach dèan aonadan air ùr-thrusadh gnìomh sa "
 "chuairt a thrus thu iad; 's urrainn dhut an cleachdadh an ath-chuairt. Sa "
 "chnàmh-sgeul seo, chan fhaigh thu roghainn ach air aon seòrsa dhe dh’aonad: "
-"An Cathach Sìthiche."
+"An cathach-sìthe."

 #. [event]
 #: data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg:596
 msgid "Recruit two Elvish Fighters"
-msgstr "Trus dithis Chathach Sìthiche"
+msgstr "Trus dithis chathach-sìthe"

 #. [message]: speaker=narrator
 #: data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg:615
@ -633,9 +633,9 @@ msgid ""
 "now would you? Use the fighters you recruited first; they’ll be a lot of "
 "help."
 msgstr ""
-"Cha dèanadh tu fhèin rudeigin gòrach a leithid cruinn-leum air an dumaidh ud "
-"a-rithist, an dèanadh? Cleachd na cathaich a thrus thu an toiseach; bheir "
-"iad cuideachadh mòr dhut."
+"Cha dèanadh tu fhèin rudeigin gòrach a leithid brùchdadh air an dumaidh ud a-"
+"rithist, an dèanadh? Cleachd na cathaich a thrus thu an toiseach; bheir iad "
+"cuideachadh mòr dhut."

 #. [message]: speaker=Delfador
 #: data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg:720
@ -739,10 +739,10 @@ msgid ""
 msgstr ""
 "Nuair a choisinneas aonad puingean eòlais gu leòr (tha am <i>bàr-eòlais</i>, "
 "ma tha e ann, taobh <b>deas</b> a’ </i>bhàir-phuingean-beatha</i>), "
-"coisinnidh e rang. Tha dà roghainn dhe dh’àrdachadh aig Cathaich Shìthiche "
-"is ’s urrainn dhut taghadh dè am fear a dh’iarras tu. Co-dhiù, bidh an dà "
-"chuid dhe chosgaisean an lùib aonadan an dàrna rang na an lùib aonadan a’ "
-"chiad rang."
+"coisinnidh e rang. Tha dà roghainn dhe dh’àrdachadh aig cathaich-shìthe is "
+"’s urrainn dhut taghadh dè am fear a dh’iarras tu. Co-dhiù, bidh an dà chuid "
+"dhe chosgaisean an lùib aonadan an dàrna rang na an lùib aonadan a’ chiad "
+"rang."

 #. [message]: speaker=narrator
 #: data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg:830
@ -962,7 +962,7 @@ msgid ""
 msgstr ""
 "Fàilte air ais! Seo a’ phàirt eile dhen oideachadh. Ionnsaichidh pàirt 2 "
 "dhut mu ais-ghairm aonadan, comasan is ionnsaighean sònraichte, teachd a-"
-"steach is beathachadh, gluasad gu astar fada, raointean-smachd agus àm an "
+"steach is beathachadh, gluasad gu astar fada, raointean-smachd agus àm dhen "
 "latha."

 #. [message]: speaker=student
@ -1166,9 +1166,9 @@ msgid ""
 "fighters, and a shaman."
 msgstr ""
 "’S urrainn dhut dà sheòrsa ùr de dh’aonad a thrusadh san chnàmh-sgeul seo: "
-"Boghadairean Sìthiche agus Ban-seumanan Shìthiche. Innsidh mi barrachd dhut "
-"mun dèidhinn nuair a thrusas tu iad. Mholainn-sa gun tog thu feachd "
-"cothromach le dithis bhoghadair, dithis chathach is aonar bhan-seuman."
+"Boghadairean-sìthe agus Ban-seumanan-sìthe. Innsidh mi barrachd dhut mun "
+"dèidhinn nuair a thrusas tu iad. Mholainn-sa gun tog thu feachd cothromach "
+"le dithis bhoghadair, dithis chathach is aonar bhan-seuman."

 #. [event]
 #: data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg:268
@ -1178,7 +1178,7 @@ msgstr "Trus no ais-ghairm saighdearan"
 #. [message]: speaker=narrator
 #: data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg:282
 msgid "Elvish Shaman"
-msgstr "Ban-seuman Sìthiche"
+msgstr "Ban-seuman-shìthe"

 #. [message]: speaker=narrator
 #: data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg:283
@ -1187,7 +1187,7 @@ msgid ""
 "friendly units around her. She also has a special attack which <i>slows</i> "
 "enemies, halving the damage they do for one turn."
 msgstr ""
-"’S e aonad caran lag a th’ anns a’ Bhan-sheuman Shìthiche, ach tha an comas "
+"’S e aonad caran lag a th’ anns a’ bhan-sheuman-shìthe, ach tha an comas "
 "aice gus aonadan càirdeil eile mu a cuairt a <i>shlànachadh</i>. Cuideachd, "
 "tha ionnsaigh sònraichte aice a bheir <i>maille</i> air nàimhdean gus nach "
 "dèan iad ach leth-dhochann fad cuairt."
@ -1211,7 +1211,7 @@ msgstr ""
 "Bidh <i>comasan</i> sònraichte aig cuid a sheòrsa aonaid. Chan eil iad "
 "coltach ri feartan a gheibh buannachdan no easbhaidhean beaga do dh’aonadan "
 "ach bheir iad giùlan sònraichte dhaibh nach eil aig aonadan àbhaisteach. Tha "
-"comas sònraichte slànachaidh aig a’ Bhan-seuman Shìthiche agus leigidh seo "
+"comas sònraichte slànachaidh aig a’ bhan-seuman-shìthe agus leigidh seo "
 "leatha gach aonad caidreabhach ri a taobh a shlànachadh le 4 puingean-beatha "
 "aig toiseach gach cuairte. Faodaidh seòrsaichean aonaid le comasan "
 "sònraichte mar an slànachadh a bhith glè fheumail, mar sin bidh cùramach "
@ -1245,7 +1245,7 @@ msgstr ""
 #. [message]: speaker=narrator
 #: data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg:314
 msgid "Elvish Archer"
-msgstr "Boghadair Sìthiche"
+msgstr "Boghadair-sìthe"

 #. [message]: speaker=narrator
 #: data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg:315
@ -1255,8 +1255,8 @@ msgid ""
 "melee attacks with strong ranged attacks, and vice versa. This allows your "
 "units to take less damage overall when your enemy counterattacks."
 msgstr ""
-"Fhad ’s a tha ionnsaighean dlùtha cumhachdach aig a’ Chathach Shìthiche, tha "
-"ionnsaigh astair cumhachdach aig a’ Bhoghadair Shìthiche. Tha e feumail "
+"Fhad ’s a tha ionnsaighean dlùtha cumhachdach aig a’ chathach-shìthe, tha "
+"ionnsaigh astair cumhachdach aig a’ bhoghadair-shìthe. Tha e feumail "
 "ionnsaigh a thoirt air aonadan nàimhdeil aig a bheil ionnsaigh dhlùth "
 "chumhachdach le ionnsaigh astair chumhachdach agus a chaochladh. Chan "
 "fhulaing na h-aonadan agad cus dochainn mar sin nuair a bheir an nàmhaid "
@ -1323,12 +1323,6 @@ msgstr "Clàr na staide"

 #. [message]: speaker=narrator
 #: data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg:385
-#, fuzzy
-#| msgid ""
-#| "The Status Table details the sides’ current status and starting "
-#| "conditions. Fog and shroud will affect what you can see in this table, "
-#| "and occasionally a side may be hidden. It is useful to check this table "
-#| "when a scenario begins."
 msgid ""
 "The Status Table details the sides’ current status and starting conditions. "
 "Fog and shroud will affect what you can see in this table, and occasionally "
@ -1337,8 +1331,9 @@ msgid ""
 msgstr ""
 "Seallaidh clàr na staide staid làithreach na taobhan agus na cumhan "
 "tòiseachaidh. Bidh buaidh aig sgleò is ceò a chogaidh air na chì thu air a’ "
-"chlàr seo agus dh’fhaoidte gu bheil taobh falaichte gu tur. Tha e feumail "
-"sùil a thoirt air a’ chlàr aig toiseach cnàmh-sgeòil."
+"chlàr seo agus dh’fhaoidte gu bheil taobh falaichte gu tur; gidheadh, tha e "
+"feumail sùil a thoirt air a’ chlàr aig toiseach cnàmh-sgeòil. Gheibh thu "
+"greim air sa phrìomh-<b>chlàr-taice</b>."

 #. [message]: speaker=Galdrad
 #: data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg:403
@ -1690,13 +1685,14 @@ msgstr ""
 "<i>coimeasgach</i> is tha seo a’ ciallachadh gu bheil na h-ionnsaighean aca "
 "25% nas treasa. Air an latha, bidh na h-ionnsaighean aca 25% nas laige, is "
 "mothaichidh tu an diofar. Tha thu fhèin <i>dligheach</i>: nas treasa air an "
-"latha is nas laige air an oidhche. Tha na saighdearan sìthiche agad "
-"<i>neodrach</i>, ’s e seo nach dèan àm an latha diofar sam bith dhaibh."
+"latha is nas laige air an oidhche. Tha na saighdearan-sìthe agad "
+"<i>neodrach</i>, ’s e seo nach dèan an t-àm dhen latha diofar sam bith "
+"dhaibh."

 #. [message]: speaker=narrator
 #: data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg:671
 msgid "Time of Day"
-msgstr "Àm an latha"
+msgstr "Àm dhen latha"

 #. [message]: speaker=narrator
 #: data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg:673
@ -1707,12 +1703,12 @@ msgid ""
 "You can hover over the sky image below the minimap on the right to see the "
 "current time of day and who has the advantage."
 msgstr ""
-"Thig atharrachadh air àm an latha rè cnàmh-sgeòil a-rèir nan cuairtean. Tha "
-"ceithir <i>co-thaobhaidhean</i> ann a dh’fhaodadh a bhith aig aonad: "
+"Thig atharrachadh air àm dhen latha rè cnàmh-sgeòil a-rèir nan cuairtean. "
+"Tha ceithir <i>co-thaobhaidhean</i> ann a dh’fhaodadh a bhith aig aonad: "
 "dligheach, neodrach, coimeasgach no stairsnich. Gheibh gach co-thaobhadh "
-"buannachdan is easbhaidhean sònraichte a-rèir àm an latha. Fan leis an "
-"luchag air dealbh an speura fon mheanbh-mhapa taobh deas ach am faic thu àm "
-"an latha agus cò aige a tha a’ bhuannachd an-dràsta."
+"buannachdan is easbhaidhean sònraichte a-rèir an ama dhen latha. Fan leis an "
+"luchag air dealbh an speura fon mheanbh-mhapa taobh deas ach am faic thu an "
+"t-àm dhen latha agus cò aige a tha a’ bhuannachd an-dràsta."

 #. [event]
 #: data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg:684
@ -1763,11 +1759,6 @@ msgstr "Cumhachan buaidhe"

 #. [message]: speaker=narrator
 #: data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg:715
-#, fuzzy
-#| msgid ""
-#| "In this scenario, you only need to defeat the orc leader to win. Victory "
-#| "conditions for a scenario are given under <b>Scenario Objectives</b> in "
-#| "<b>Menu</b>."
 msgid ""
 "In this scenario, you only need to defeat the orc leader to win. Victory "
 "conditions for a scenario are given under <b>Scenario Objectives</b> in the "
@ -1775,7 +1766,7 @@ msgid ""
 msgstr ""
 "Sa chnàmh-sgeul seo, cha leig thu leas ach buaidh a thoirt air ceannard nan "
 "deamhan. Chì thu na cumhachdan buaidhe airson cnàmh-sgeòil fo <b>Amasan "
-"cnàmh-sgeòil</b> sa <p>chlàr-taice</b>."
+"cnàmh-sgeòil</b> sa phrìomh-<p>chlàr-taice</b>."

 #. [message]: speaker=narrator
 #: data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg:724
@ -1932,7 +1923,7 @@ msgstr ""
 "seach 4 a-mhàin agus ’s urrainn dhomh a leigheas o phuinnsean cuideachd mura "
 "ruig iad baile! Tha ionnsaigh <i>dhraoidheach</i> ùr agam cuideachd aig a "
 "bheil seans bualaidh dhe 70% an-còmhnaidh ach chan eil i cho cumhachdach ’s "
-"a tha an ionnsaigh coltach rithe a nì a’ Bhana-bhuidseach Shìthiche."
+"a tha an ionnsaigh coltach rithe a nì a’ bhana-bhuidseach-shìthe."

 #. [message]: speaker=unit
 #. The speaker is female
@ -1945,8 +1936,8 @@ msgid ""
 msgstr ""
 "Chaidh mo shlànachadh gu lèir on a fhuair mi àrdachadh chun ath-rang! Chan "
 "urrainn dhomh na h-aonadan ri mo thaobh a shlànachadh tuilleadh ach fhuair "
-"mi ionnsaigh teine Sìthiche chumhachdach ùr ’na àite a bhuaileas 4 tursan le "
-"7 dhe dhochann. ’S e ionnsaigh shònraichte <i>dhraoidheach</i> a th’ innte "
+"mi ionnsaigh teine-sìthe chumhachdach ùr ’na àite a bhuaileas 4 tursan le 7 "
+"dhe dhochann. ’S e ionnsaigh shònraichte <i>dhraoidheach</i> a th’ innte "
 "cuideachd agus is ciall dha seo gu bheil seans bualaidh dhe 70% oirre an-"
 "còmhnaidh."

@ -2012,10 +2003,10 @@ msgid ""
 msgstr ""
 "Thug an t-àrdachadh slànachadh iomlan dhomh! Tha mi math air an dà chuid "
 "bogha is claidheamh, is tha comas sònraichte agam: <i>Ceannardas<i>. Cha "
-"dèan mi uiread a dhochann mar a nì Laoch Sìthiche ach leigidh an comas agam "
-"le aonadan caidreabhach a tha faisg orm sabaid nas fhearr. Nì aonadan a’ "
-"chiad ìre mu mo chuairt 25% dhe dhochann a bharrachd, mar sin suidhich gu "
-"cùramach mi."
+"dèan mi uiread a dhochann mar a nì laoch-sìthe ach leigidh an comas agam le "
+"aonadan caidreabhach a tha faisg orm sabaid nas fhearr. Nì aonadan a’ chiad "
+"ìre mu mo chuairt 25% dhe dhochann a bharrachd, mar sin suidhich gu cùramach "
+"mi."

 #. [message]: speaker=unit
 #: data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg:1064
@ -2027,8 +2018,8 @@ msgid ""
 msgstr ""
 "Thug an t-àrdachadh slànachadh iomlan dhomh! Tha mi gu sònraichte math air "
 "a’ chlaidheamh is nì mi 8 dochann le 4 ionnsaighean. Ged nach eil comasan "
-"ceannardais a' Chaiptein Shìthiche agam, nì mi barrachd dochann leis na "
-"comasan sabaid nas fhearr a th' agam!"
+"ceannardais a' chaiptein-shìthe agam, nì mi barrachd dochann leis na comasan "
+"sabaid nas fhearr a th' agam!"

 #. [message]: speaker=Galdrad
 #: data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg:1073
--- a/po/wesnoth-units/gd.po
+++ b/po/wesnoth-units/gd.po
--- a/po/wesnoth/gd.po
+++ b/po/wesnoth/gd.po
@ -813,7 +813,7 @@ msgstr "Bogha criostail"
 #. [item]: id=bow-elven
 #: data/core/editor/items.cfg:136
 msgid "Elven Bow"
-msgstr "Bogha shìthiche"
+msgstr "Bogha-shìthe"

 #. [item]: id=bow
 #: data/core/editor/items.cfg:142
@ -3462,7 +3462,7 @@ msgstr "Deas-ghnàth nan gaisgeach"
 #. [music]
 #: data/core/macros/sound-utils.cfg:205
 msgid "Into the Shadows"
-msgstr "Dha na faileasan"
+msgstr "Dha na sgàilean"

 #. [music]
 #: data/core/macros/sound-utils.cfg:211
@ -3671,7 +3671,7 @@ msgstr "Saidhean"
 #. [color_range]: id=gold
 #: data/core/team-colors.cfg:107
 msgid "color^Gold"
-msgstr ""
+msgstr "Òrach"

 #. [color_range]: id=reef
 #: data/core/team-colors.cfg:116
@ -4275,12 +4275,12 @@ msgstr "na chlach"
 #. [lua]: set_status
 #: data/lua/wml/harm_unit.lua:130
 msgid "female^unhealable"
-msgstr "dho-slànach"
+msgstr "dho-slànaichte"

 #. [lua]: set_status
 #: data/lua/wml/harm_unit.lua:130
 msgid "unhealable"
-msgstr "do-slànach"
+msgstr "do-slànaichte"

 #. #-#-#-#-#  wesnoth.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [lua]: wesnoth.wml_actions.message
@ -4501,7 +4501,7 @@ msgstr "teachd a-steach"
 #. [label]: id=battery-icon
 #: data/themes/classic.cfg:266
 msgid "battery"
-msgstr ""
+msgstr "bataraidh"

 #. [unit_level]: id=unit-level
 #: data/themes/classic.cfg:438
@ -4744,7 +4744,7 @@ msgid ""
 msgstr ""
 "Sabaididh aonadan <i>dligheach</i> nas fhearr air an latha is aonadan "
 "<i>coimeasgach</i> nas fhearr air an oidhche. Tha aonadan <i>neodrach</i> "
-"coma mu dhèidhinn oidhche no latha. Sabaididh na h-aonadan ainneamh "
+"coma mu dhèidhinn an ama dhen latha. Sabaididh na h-aonadan ainneamh "
 "<i>stairsnich</i> nas fhearr air a’ chiaradh is chamhanaich."

 #. [tip]
@ -4760,8 +4760,8 @@ msgstr ""
 msgid ""
 "An otherwise sound plan can fail if you attack at the wrong time of day."
 msgstr ""
-"Faodaidh plana math tuiteam às a chèile ma bheir thu ionnsaigh air àm an "
-"latha cearr."
+"Faodaidh plana math tuiteam às a chèile ma bheir thu ionnsaigh air àm cearr "
+"dhen latha."

 #. [tip]
 #: data/tips.cfg:61 data/tips.cfg:85 data/tips.cfg:137 data/tips.cfg:145
@ -5166,7 +5166,7 @@ msgid ""
 "Charging units are best used against enemies they can kill with a single "
 "blow."
 msgstr ""
-"Tha aonadan le cruinn-leum nas fearr an aghaidh nàimhdean a mharbhas iad le "
+"Tha aonadan le brùchdadh nas fearr an aghaidh nàimhdean a mharbhas iad le "
 "aon bhuille."

 #. [tip]
@ -5268,11 +5268,11 @@ msgid ""
 msgstr ""
 "Tha an comas <i>maille</i> fìor chumhachdach oir tha buaidhean fad is "
 "farsaing aige. Chan fhaigh an nàmhaid ach an dàrna leth à comas <i>sùigh</"
-"i>, chan fhaigh e buannachd à <i>cruinn-leum</i> no <i>cùl-shàthadh</i> idir "
-"is tha <i>caothach a’ chatha</i> nas laige. Tha e doirbh dha nàimhdean "
-"luatha teicheadh, tha nàimhdean malla cha mhòr gun ghluasad is chan fhaigh "
-"na h-aonadan agad fhèin cus dochann dìoghaltais is mar sin gheibh iad "
-"slànachadh nas luaithe."
+"i>, chan fhaigh e buannachd à <i>brùchdadh</i> no <i>cùl-shàthadh</i> idir "
+"is tha <i>mire-chatha</i> nas laige air. Tha e doirbh dha nàimhdean luatha "
+"teicheadh, tha nàimhdean malla cha mhòr gun ghluasad is chan fhaigh na h-"
+"aonadan agad fhèin cus dochann dìoghaltais is mar sin gheibh iad slànachadh "
+"nas luaithe."

 #. [tip]
 #: data/tips.cfg:225
@ -5338,7 +5338,7 @@ msgid ""
 "<i>Charge</i> against a slowed opponent, the results can be impressive."
 msgstr ""
 "Faodaidh iomadh chomas sònraichte còmhla a bhith marbhtach. Ged a bheireadh "
-"e obair gus <i>ceannardas</i>, <i>soillseachadh</i> is <i>cruinn-leum</i> a "
+"e obair gus <i>ceannardas</i>, <i>soillseachadh</i> is <i>brùchdadh</i> a "
 "chur còmhla an aghaigh nàmhad air a bheil maille, mar eisimpleir, faodaidh "
 "an toradh a bhith drùidhteach."

@ -7292,7 +7292,7 @@ msgstr "Chan urrainn dhut ais-ghairm air an àite comharraichte an-dràsta"

 #: src/menu_events.cpp:387
 msgid "No unit recalled"
-msgstr ""
+msgstr "Cha deach aonad ais-ghairm"

 #: src/menu_events.cpp:404
 msgid "You must have at least 1 gold piece to recall a unit"
@ -7453,8 +7453,8 @@ msgid ""
 "Change turn number (and time of day), or increase by one if no number is "
 "specified."
 msgstr ""
-"Atharraich àireamh nan cuairtean (is àm an latha), no cuir 1 ris mura h-eil "
-"àireamh ’ga cur a-steach."
+"Atharraich àireamh nan cuairtean (is an t-àm dhen latha), no cuir 1 ris mura "
+"h-eil àireamh ’ga cur a-steach."

 #: src/menu_events.cpp:1212
 msgid "[turn]"
@ -7602,15 +7602,15 @@ msgstr "Chan urrainn dhan IF smachd a ghabhail air taobh lìonraidh: “$side|.

 #: src/menu_events.cpp:1434
 msgid "Side '$side' is already droided."
-msgstr ""
+msgstr "Tha smachd aig IF air “$side” mu thràth."

 #: src/menu_events.cpp:1444
 msgid "Side '$side' controller is now controlled by: AI."
-msgstr ""
+msgstr "Tha “$side” fo smachd IF a-nis."

 #: src/menu_events.cpp:1446
 msgid "Side '$side' controller is now controlled by: human."
-msgstr ""
+msgstr "Tha “$side” fo smachd daonna a-nis."

 #: src/menu_events.cpp:1454
 msgid "Can't droid a local ai side: '$side'."
@ -8039,7 +8039,7 @@ msgstr "Le feartan sònraichte: "

 #: src/reports.cpp:707
 msgid "Time of day: "
-msgstr "Àm an latha: "
+msgstr "Àm dhen latha: "

 #: src/reports.cpp:711
 msgid "Leadership: "
@ -8208,7 +8208,7 @@ msgstr "Cleoc"

 #: src/reports.cpp:1560
 msgid "Battery"
-msgstr ""
+msgstr "Bataraidh"

 #: src/reports.cpp:1589
 msgid "Countdown until your turn automatically ends."
@ -8530,11 +8530,11 @@ msgstr "Grad-iuchair: "

 #: src/time_of_day.cpp:45
 msgid "Stub Time of Day"
-msgstr "Bun-àm an latha"
+msgstr "Bun-àm dhen latha"

 #: src/time_of_day.cpp:46
 msgid "This Time of Day is only a Stub!"
-msgstr "Chan eil àm an latha seo ach ’na bhun-àm!"
+msgstr "Chan eil an t-àm dhen latha seo ach ’na bhun-àm!"

 #. TRANSLATORS: Current value for WML code increase_damage, documented in https://wiki.wesnoth.org/EffectWML
 #: src/units/attack_type.cpp:356