From 5afda3e7f8ee57f0194acc9a9142596e696bcafd Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Fri, 27 Dec 2019 12:49:43 +0000
Subject: [PATCH 01/38] Create gd.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Create Gàidhlig (Scottish Gaelic) translation
---
 lib/lang/gd.js | 168 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 168 insertions(+)
 create mode 100644 lib/lang/gd.js

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
new file mode 100644
index 00000000..0fed87cd
--- /dev/null
+++ b/lib/lang/gd.js
@@ -0,0 +1,168 @@
+"use strict";
+
+function join_with_shared_prefix(a, b, joiner) {
+  let m = a;
+  let i = 0;
+
+  // HACK: This gets around "today through on Tuesday" or cases like it, which
+  // are incorrect in English.
+  if(m === "an-diugh" || m === "a-màireachd")
+    m = "air " + m;
+
+  while(i !== m.length &&
+        i !== b.length &&
+        m.charCodeAt(i) === b.charCodeAt(i))
+    ++i;
+
+  while(i && m.charCodeAt(i - 1) !== 32)
+    --i;
+
+  return a + joiner + b.slice(i);
+}
+
+function strip_prefix(period) {
+  return period.slice(0, 9) === "fad na h-oidhche" ? period.slice(4) :
+    period.slice(0, 7) === "ann an " ? period.slice(7) :
+      period;
+}
+
+module.exports = {
+  "clear": "soilleir",
+  "no-precipitation": "chan eil sileadh ann",
+  "mixed-precipitation": "sileadh measgaichte",
+  "possible-very-light-precipitation": "tha cothrom ann gum bi sileadh glè aotrom",
+  "very-light-precipitation": "sileadh glè aotrom",
+  "possible-light-precipitation": "tha cothrom ann gum bi sileadh aotrom",
+  "light-precipitation": "sileadh aotrom",
+  "medium-precipitation": "sileadh",
+  "heavy-precipitation": "sileadh trom",
+  "possible-very-light-rain": "tha cothrom ann gum bi uisge glè aotrom",
+  "very-light-rain": "uisge glè aotrom",
+  "possible-light-rain": "tha cothrom ann gum bi uisge aotrom",
+  "light-rain": "uisge aotrom",
+  "medium-rain": "uisge",
+  "heavy-rain": "uisge trom",
+  "possible-very-light-sleet": "tha cothrom ann gum bi flin glè aotrom",
+  "very-light-sleet": "flin glè aotram",
+  "possible-light-sleet": "tha cothrom ann gum bi flin aotrom",
+  "light-sleet": "flin aotram",
+  "medium-sleet": "flin",
+  "heavy-sleet": "flin trom",
+  "possible-very-light-snow": "fras sneachda",
+  "very-light-snow": "frasan sneachda",
+  "possible-light-snow": "tha cothrom ann gum bi frasan sneachda",
+  "light-snow": "sneachd aotrom",
+  "medium-snow": "sneachd",
+  "heavy-snow": "sneachda trom",
+  "possible-thunderstorm": "tha cothrom ann gum bi stoirmean tàirneanaich",
+  "thunderstorm": "stoirmean tàirneanaich",
+  "light-wind": "oiteag shocair",
+  "medium-wind": "gaothach",
+  "heavy-wind": "gaoth chunnartach",
+  "low-humidity": "tioram",
+  "high-humidity": "tais",
+  "fog": "ceòthach",
+  "light-clouds": "sgotham aotrom",
+  "medium-clouds": "sgothach",
+  "heavy-clouds": "sgothan trom",
+  "today-morning": "madainn an-diugh",
+  "later-today-morning": "later this morning",
+  "today-afternoon": "feasgar an-diugh",
+  "later-today-afternoon": "later this afternoon",
+  "today-evening": "feasgar an-diugh",
+  "later-today-evening": "later this evening",
+  "today-night": "a-nochd",
+  "later-today-night": "later tonight",
+  "tomorrow-morning": "madainn a-màireach",
+  "tomorrow-afternoon": "feasgar a-màireach",
+  "tomorrow-evening": "feasgar a-màireach",
+  "tomorrow-night": "an ath oidhche",
+  "morning": "anns a' mhadainn",
+  "afternoon": "anns an fheasgar",
+  "evening": "anns an fheasgar",
+  "night": "tron oidhche",
+  "today": "an-diugh",
+  "tomorrow": "a-màireach",
+  "sunday": "Didòmhnaich",
+  "monday": "Diluain",
+  "tuesday": "Dimàirt",
+  "wednesday": "Diciadain",
+  "thursday": "Diardaoin",
+  "friday": "Dihaoine",
+  "saturday": "Disathairne",
+  "next-sunday": "Didòmhnaich an ath sheachdain",
+  "next-monday": "Diluain an ath sheachdain",
+  "next-tuesday": "Dimàirt an ath sheachdain",
+  "next-wednesday": "Diciadain an ath sheachdain",
+  "next-thursday": "Diardaoin an ath sheachdain",
+  "next-friday": "Dihaoine an ath sheachdain",
+  "next-saturday": "Disathairne  an ath sheachdain",
+  "minutes": "$1 mion.",
+  "fahrenheit": "$1\u00B0F",
+  "celsius": "$1\u00B0C",
+  "inches": "$1 òir.",
+  "centimeters": "$1 cm.",
+  "less-than": "< $1",
+  "and": function(a, b) {
+    return join_with_shared_prefix(
+      a,
+      b,
+      a.indexOf(",") !== -1 ? ", agus " : " agus "
+    );
+  },
+  "through": function(a, b) {
+    return join_with_shared_prefix(a, b, " tro ");
+  },
+  "with": "$1, le $2",
+  "range": "$1\u2013$2",
+  "parenthetical": function(a, b) {
+    return a + " (" + b + (a === "sileadh measgaichte" ? " sneachda)" : ")");
+  },
+  "for-hour": "$1 fad uair a thìde",
+  "starting-in": "$1 a' tòiseachadh ann an $2",
+  "stopping-in": "$1 a' stad ann an $2",
+  "starting-then-stopping-later": "$1 a' tòiseachadh ann an $2, a' stad as dèidh $3",
+  "stopping-then-starting-later": "$1 a' stad ann an $2, a' tòiseachadh a-rithist as dèidh $3",
+  "for-day": "$1 fad an latha",
+  "starting": "$1 a' tòiseachadh $2",
+  "until": function(condition, period) {
+    return condition + " gu " + strip_prefix(period);
+  },
+  "until-starting-again": function(condition, a, b) {
+    return condition + " gu " + strip_prefix(a) + ", a' tòiseachadh a-rithist " + b;
+  },
+  "starting-continuing-until": function(condition, a, b) {
+    return condition + " a' tòiseachadh " + a + ", a' dol gu " + strip_prefix(b);
+  },
+  "during": "$1 $2",
+  "for-week": "$1 fad na seachdain",
+  "over-weekend": "$1 thairis air an deireadh-sheachdain",
+  "temperatures-peaking": "teòthachd àrd suas gu $1 $2",
+  "temperatures-rising": "teòthachd àrd a' fàs gu $1 $2",
+  "temperatures-valleying": "teòthachd àrd sìoss gu $1 $2",
+  "temperatures-falling": "teòthachd àrd a' tuiteam gu $1 $2",
+  // Capitalize the first letter of every word, except if that word is
+  // "and". (This is a very crude bastardization of proper English titling
+  // rules, but it is adequate for the purposes of this module.)
+  "title": function(str) {
+    return str.replace(
+      /\b(?:a(?!nd\b)|c(?!m\.)|i(?!n\.)|[^\Waci])/g,
+      function(letter) {
+        return letter.toUpperCase();
+      }
+    );
+  },
+  /* Capitalize the first word of the sentence and end with a period. */
+  "sentence": function(str) {
+    /* Capitalize. */
+    str = str.charAt(0).toUpperCase() + str.slice(1);
+
+    /* Add a period if there isn't already one. */
+    if(str.charAt(str.length - 1) !== ".")
+      str += ".";
+
+    return str;
+  },
+  "unavailable-radar": "Cha deach dad a lorg an-dràsta air sgàth 's $1.",
+  "station-offline": "gu bheil a h-uile stèisean-radar far-loidhne",
+};

From 4fd568d3593be2163a9a9ef57bef436a94adf6ed Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Fri, 27 Dec 2019 13:00:42 +0000
Subject: [PATCH 02/38] Update gd.js

---
 lib/lang/gd.js | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index 0fed87cd..f56fd728 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -1,29 +1,17 @@
 "use strict";
 
 function join_with_shared_prefix(a, b, joiner) {
-  let m = a;
   let i = 0;
 
-  // HACK: This gets around "today through on Tuesday" or cases like it, which
-  // are incorrect in English.
-  if(m === "an-diugh" || m === "a-màireachd")
-    m = "air " + m;
-
-  while(i !== m.length &&
+  while(i !== a.length &&
         i !== b.length &&
-        m.charCodeAt(i) === b.charCodeAt(i))
+        a.charCodeAt(i) === b.charCodeAt(i))
     ++i;
 
-  while(i && m.charCodeAt(i - 1) !== 32)
+  while(i && a.charCodeAt(i - 1) !== 32)
     --i;
 
-  return a + joiner + b.slice(i);
-}
-
-function strip_prefix(period) {
-  return period.slice(0, 9) === "fad na h-oidhche" ? period.slice(4) :
-    period.slice(0, 7) === "ann an " ? period.slice(7) :
-      period;
+  return a.slice(0, i) + a.slice(i) + joiner + b.slice(i);
 }
 
 module.exports = {

From 2d8d5285020dbaf19459598f88b6d3df5a87170a Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Fri, 27 Dec 2019 13:06:55 +0000
Subject: [PATCH 03/38] Update gd.js

---
 lib/lang/gd.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index f56fd728..b787267d 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -1,17 +1,29 @@
 "use strict";
 
 function join_with_shared_prefix(a, b, joiner) {
+  let m = a;
   let i = 0;
 
-  while(i !== a.length &&
+  // HACK: This gets around "today through on Tuesday" or cases like it, which
+  // are incorrect in English.
+  if(m === "an-diugh" || m === "a-màireach")
+    m = "air " + m;
+
+  while(i !== m.length &&
         i !== b.length &&
-        a.charCodeAt(i) === b.charCodeAt(i))
+        m.charCodeAt(i) === b.charCodeAt(i))
     ++i;
 
-  while(i && a.charCodeAt(i - 1) !== 32)
+  while(i && m.charCodeAt(i - 1) !== 32)
     --i;
 
-  return a.slice(0, i) + a.slice(i) + joiner + b.slice(i);
+  return a + joiner + b.slice(i);
+}
+
+function strip_prefix(period) {
+  return period.slice(0, 9) === "fad na h-oidhche" ? period.slice(4) :
+    period.slice(0, 7) === "ann an " ? period.slice(7) :
+      period;
 }
 
 module.exports = {

From 60649adff42365e117972355f23b0a24ba6a9ac5 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Fri, 27 Dec 2019 13:11:41 +0000
Subject: [PATCH 04/38] Update gd.js

---
 lib/lang/gd.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index b787267d..35754b3b 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -77,7 +77,7 @@ module.exports = {
   "tomorrow-afternoon": "feasgar a-màireach",
   "tomorrow-evening": "feasgar a-màireach",
   "tomorrow-night": "an ath oidhche",
-  "morning": "anns a' mhadainn",
+  "morning": "anns a\' mhadainn",
   "afternoon": "anns an fheasgar",
   "evening": "anns an fheasgar",
   "night": "tron oidhche",
@@ -119,28 +119,28 @@ module.exports = {
     return a + " (" + b + (a === "sileadh measgaichte" ? " sneachda)" : ")");
   },
   "for-hour": "$1 fad uair a thìde",
-  "starting-in": "$1 a' tòiseachadh ann an $2",
-  "stopping-in": "$1 a' stad ann an $2",
-  "starting-then-stopping-later": "$1 a' tòiseachadh ann an $2, a' stad as dèidh $3",
-  "stopping-then-starting-later": "$1 a' stad ann an $2, a' tòiseachadh a-rithist as dèidh $3",
+  "starting-in": "$1 a\' tòiseachadh ann an $2",
+  "stopping-in": "$1 a\' stad ann an $2",
+  "starting-then-stopping-later": "$1 a\' tòiseachadh ann an $2, a\' stad as dèidh $3",
+  "stopping-then-starting-later": "$1 a\' stad ann an $2, a\' tòiseachadh a-rithist as dèidh $3",
   "for-day": "$1 fad an latha",
-  "starting": "$1 a' tòiseachadh $2",
+  "starting": "$1 a\' tòiseachadh $2",
   "until": function(condition, period) {
     return condition + " gu " + strip_prefix(period);
   },
   "until-starting-again": function(condition, a, b) {
-    return condition + " gu " + strip_prefix(a) + ", a' tòiseachadh a-rithist " + b;
+    return condition + " gu " + strip_prefix(a) + ", a\' tòiseachadh a-rithist " + b;
   },
   "starting-continuing-until": function(condition, a, b) {
-    return condition + " a' tòiseachadh " + a + ", a' dol gu " + strip_prefix(b);
+    return condition + " a\' tòiseachadh " + a + ", a\' dol gu " + strip_prefix(b);
   },
   "during": "$1 $2",
   "for-week": "$1 fad na seachdain",
   "over-weekend": "$1 thairis air an deireadh-sheachdain",
   "temperatures-peaking": "teòthachd àrd suas gu $1 $2",
-  "temperatures-rising": "teòthachd àrd a' fàs gu $1 $2",
+  "temperatures-rising": "teòthachd àrd a\' fàs gu $1 $2",
   "temperatures-valleying": "teòthachd àrd sìoss gu $1 $2",
-  "temperatures-falling": "teòthachd àrd a' tuiteam gu $1 $2",
+  "temperatures-falling": "teòthachd àrd a\' tuiteam gu $1 $2",
   // Capitalize the first letter of every word, except if that word is
   // "and". (This is a very crude bastardization of proper English titling
   // rules, but it is adequate for the purposes of this module.)
@@ -163,6 +163,6 @@ module.exports = {
 
     return str;
   },
-  "unavailable-radar": "Cha deach dad a lorg an-dràsta air sgàth 's $1.",
+  "unavailable-radar": "Cha deach dad a lorg an-dràsta air sgàth \'s $1.",
   "station-offline": "gu bheil a h-uile stèisean-radar far-loidhne",
 };

From 6e53b8f04590b5c387a0e2bb4f07d4d96c3521af Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Fri, 27 Dec 2019 13:13:30 +0000
Subject: [PATCH 05/38] Update gd.js

---
 lib/lang/gd.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index 35754b3b..b787267d 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -77,7 +77,7 @@ module.exports = {
   "tomorrow-afternoon": "feasgar a-màireach",
   "tomorrow-evening": "feasgar a-màireach",
   "tomorrow-night": "an ath oidhche",
-  "morning": "anns a\' mhadainn",
+  "morning": "anns a' mhadainn",
   "afternoon": "anns an fheasgar",
   "evening": "anns an fheasgar",
   "night": "tron oidhche",
@@ -119,28 +119,28 @@ module.exports = {
     return a + " (" + b + (a === "sileadh measgaichte" ? " sneachda)" : ")");
   },
   "for-hour": "$1 fad uair a thìde",
-  "starting-in": "$1 a\' tòiseachadh ann an $2",
-  "stopping-in": "$1 a\' stad ann an $2",
-  "starting-then-stopping-later": "$1 a\' tòiseachadh ann an $2, a\' stad as dèidh $3",
-  "stopping-then-starting-later": "$1 a\' stad ann an $2, a\' tòiseachadh a-rithist as dèidh $3",
+  "starting-in": "$1 a' tòiseachadh ann an $2",
+  "stopping-in": "$1 a' stad ann an $2",
+  "starting-then-stopping-later": "$1 a' tòiseachadh ann an $2, a' stad as dèidh $3",
+  "stopping-then-starting-later": "$1 a' stad ann an $2, a' tòiseachadh a-rithist as dèidh $3",
   "for-day": "$1 fad an latha",
-  "starting": "$1 a\' tòiseachadh $2",
+  "starting": "$1 a' tòiseachadh $2",
   "until": function(condition, period) {
     return condition + " gu " + strip_prefix(period);
   },
   "until-starting-again": function(condition, a, b) {
-    return condition + " gu " + strip_prefix(a) + ", a\' tòiseachadh a-rithist " + b;
+    return condition + " gu " + strip_prefix(a) + ", a' tòiseachadh a-rithist " + b;
   },
   "starting-continuing-until": function(condition, a, b) {
-    return condition + " a\' tòiseachadh " + a + ", a\' dol gu " + strip_prefix(b);
+    return condition + " a' tòiseachadh " + a + ", a' dol gu " + strip_prefix(b);
   },
   "during": "$1 $2",
   "for-week": "$1 fad na seachdain",
   "over-weekend": "$1 thairis air an deireadh-sheachdain",
   "temperatures-peaking": "teòthachd àrd suas gu $1 $2",
-  "temperatures-rising": "teòthachd àrd a\' fàs gu $1 $2",
+  "temperatures-rising": "teòthachd àrd a' fàs gu $1 $2",
   "temperatures-valleying": "teòthachd àrd sìoss gu $1 $2",
-  "temperatures-falling": "teòthachd àrd a\' tuiteam gu $1 $2",
+  "temperatures-falling": "teòthachd àrd a' tuiteam gu $1 $2",
   // Capitalize the first letter of every word, except if that word is
   // "and". (This is a very crude bastardization of proper English titling
   // rules, but it is adequate for the purposes of this module.)
@@ -163,6 +163,6 @@ module.exports = {
 
     return str;
   },
-  "unavailable-radar": "Cha deach dad a lorg an-dràsta air sgàth \'s $1.",
+  "unavailable-radar": "Cha deach dad a lorg an-dràsta air sgàth 's $1.",
   "station-offline": "gu bheil a h-uile stèisean-radar far-loidhne",
 };

From 39e5f3110f550f1c0fd67f189fb1dabef9364356 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 03:20:57 +0000
Subject: [PATCH 06/38] Create gd.json test case

---
 test_cases/gd.json | 265 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 265 insertions(+)
 create mode 100644 test_cases/gd.json

diff --git a/test_cases/gd.json b/test_cases/gd.json
new file mode 100644
index 00000000..5200bdad
--- /dev/null
+++ b/test_cases/gd.json
@@ -0,0 +1,265 @@
+{
+  "Soilleir":
+    ["title", "clear"],
+
+  "Tha cothrom ann gum bi sileadh glè aotrom":
+    ["title", "possible-very-light-precipitation"],
+
+  "Sileadh glè aotrom":
+    ["title", "very-light-precipitation"],
+
+  "Tha cothrom ann gum bi sileadh ann":
+    ["title", "possible-light-precipitation"],
+
+  "Sileadh aotrom":
+    ["title", "light-precipitation"],
+
+  "Sileadh":
+    ["title", "medium-precipitation"],
+
+  "Sileadh trom":
+    ["title", "heavy-precipitation"],
+
+  "Tha cothrom ann gum bi uisge glè aotrom":
+    ["title", "possible-very-light-rain"],
+
+  "Uisge glè aotrom":
+    ["title", "very-light-rain"],
+
+  "Tha cothrom ann gum bi uisge aotrom":
+    ["title", "possible-light-rain"],
+
+  "Uisge aotrom":
+    ["title", "light-rain"],
+
+  "Uisge":
+    ["title", "medium-rain"],
+
+  "Uisge trom":
+    ["title", "heavy-rain"],
+
+  "Tha cothrom ann gum bi flin glè aotrom":
+    ["title", "possible-very-light-sleet"],
+
+  "Flin glè aotrom":
+    ["title", "very-light-sleet"],
+
+  "Tha cothrom ann gum bi flin aotrom":
+    ["title", "possible-light-sleet"],
+
+  "Flin aotrom":
+    ["title", "light-sleet"],
+
+  "Flin":
+    ["title", "medium-sleet"],
+
+  "Flin trom":
+    ["title", "heavy-sleet"],
+
+  "Tha cothrom ann gum bi fras sneachda":
+    ["title", "possible-very-light-snow"],
+
+  "Frasan sneachda":
+    ["title", "very-light-snow"],
+
+  "Tha cothrom ann gum bi sneachd aotrom":
+    ["title", "possible-light-snow"],
+
+  "Sneachd aotrom":
+    ["title", "light-snow"],
+
+  "Sneachd":
+    ["title", "medium-snow"],
+
+  "Sneachd trom":
+    ["title", "heavy-snow"],
+
+  "Gaothach":
+    ["title", "medium-wind"],
+
+  "Goath chunnartach":
+    ["title", "heavy-wind"],
+
+  "Ceòthach":
+    ["title", "fog"],
+
+  "Sgothach":
+    ["title", "medium-clouds"],
+
+  "Sgothan trom":
+    ["title", "heavy-clouds"],
+
+  "Tioram agus gaoth aotrom":
+    ["title", ["and", "low-humidity", "light-wind"]],
+
+  "Uisge aotrom agus gaoth chunnartach":
+    ["title", ["and", "very-light-rain", "heavy-wind"]],
+
+  "Tais agus sgothan aotrom":
+    ["title", ["and", "high-humidity", "light-clouds"]],
+
+
+  "Soilleir fad uair a thìde.":
+    ["sentence", ["for-hour", "clear"]],
+
+  "Frasan sneachda a' tòiseachadh ann an 35 mion.":
+    ["sentence", ["starting-in", "very-light-snow", ["minutes", 35]]],
+
+  "Uisge aotrom a' stad ann an 15 mìon.":
+    ["sentence", ["stopping-in", "light-rain", ["minutes", 15]]],
+
+  "Flin a' tòiseachadh ann an 20 mìon., a' stad as dèidh 30 mìn.":
+    ["sentence",
+      ["starting-then-stopping-later",
+        "heavy-sleet",
+        ["minutes", 20],
+        ["minutes", 30]]],
+
+  "Uisge a' stad ann an 25 mìon., a' tòiseachadh a-rithist as dèidh 8 mìon.":
+    ["sentence",
+      ["stopping-then-starting-later",
+        "medium-rain",
+        ["minutes", 25],
+        ["minutes", 8]]],
+
+
+  "Sgòthach fad an latha.":
+    ["sentence", ["for-day", "medium-clouds"]],
+
+  "Flin a' tòiseachadh anns a' mhadainn.":
+    ["sentence", ["starting", "very-light-sleet", "morning"]],
+
+  "Gaothach gus a-nochd.":
+    ["sentence", ["until", "medium-wind", "today-night"]],
+
+  "Sileadh trom gus an fheasgar.":
+    ["sentence", ["until", "heavy-precipitation", "afternoon"]],
+
+  "Oiteag shocair anns an fheasgar.":
+    ["sentence", ["during", "light-wind", "afternoon"]],
+
+  "Sneachd feasgar an-diugh agus madainn a-màireach.":
+    ["sentence", ["during",
+      "medium-snow",
+      ["and", "later-today-evening", "tomorrow-morning"]]],
+
+  "Uisge trom gu nas anmoiche madainn an-diugh, a' tòiseachadh a-rithist feasgar.":
+    ["sentence", ["until-starting-again",
+      "heavy-rain",
+      "later-today-morning",
+      "today-evening"]],
+
+  "Sgothan trom a' tòiseachadh anns an fheasgar, a' maireachdainn gus an oidhche.":
+    ["sentence", ["starting-continuing-until",
+      "heavy-clouds",
+      "evening",
+      "night"]],
+
+  "Flin aotrom nas anmoiche feasgar an-diugh agus ceòthach madainn a-màireach.":
+    ["sentence", ["and",
+      ["during", "light-sleet", "later-today-afternoon"],
+      ["during", "fog", "tomorrow-morning"]]],
+
+  "Gaoth chunnartach a' tòiseachadh madainn an-diugh, a' maireachdain gus an fheasgar, agus flin madainn a-màireach.":
+    ["sentence", ["and",
+      ["starting-continuing-until",
+        "heavy-wind",
+        "today-morning",
+        "today-afternoon"],
+      ["during", "medium-sleet", "tomorrow-morning"]]],
+
+  "Sgothan trom a' tòiseachadh nas anmoiche a-nochd agus sneachd trom feasgar a-màireach.":
+    ["sentence", ["and",
+      ["starting", "heavy-clouds", "later-today-night"],
+      ["during", "heavy-snow", "tomorrow-afternoon"]]],
+
+  "Tioram a-noch agus sileadh aotrom a' tòiseachadh feasgar a-màireach, a' maireachdainn gu oidhche a-màireach.":
+  "Dry tonight and light precipitation starting tomorrow evening, continuing until tomorrow night.":
+    ["sentence", ["and",
+      ["during", "low-humidity", "today-night"],
+      ["starting-continuing-until",
+        "light-precipitation",
+        "tomorrow-evening",
+        "tomorrow-night"]]],
+
+  "Sneachd (5 òir.) tron oidhche.":
+    ["sentence", ["during",
+      ["parenthetical", "medium-snow", ["inches", 5]],
+      "night"]],
+
+  "Sneachd aotrom (2 cm.) nas anmoiche madainn an-diugh.":
+    ["sentence", ["during",
+      ["parenthetical", "light-snow", ["centimeters", 2]],
+      "later-today-morning"]],
+
+  "Sneachd trom (8\u201312 òir.) tron latha.":
+    ["sentence", ["for-day",
+      ["parenthetical", "heavy-snow", ["inches", ["range", 8, 12]]]]],
+
+  "Sneachd (< 1 cm.) anns an fheasgar.":
+    ["sentence", ["during",
+      ["parenthetical", "medium-snow", ["less-than", ["centimeters", 1]]],
+      "afternoon"]],
+
+
+  "Gun sileadh fad na seachdain, agus an teòthard as àirde a' ruigsinn 85\u00B0F a-màireach":
+    ["sentence", ["with",
+      ["for-week", "no-precipitation"],
+      ["temperatures-peaking",
+        ["fahrenheit", 85],
+        "tomorrow"]]],
+
+  "Sileadh measgaichte thairis air an deireadh-sheachdain, agus an teòtachd as àirde a' ruigsinn 32\u00B0C Diardaoin.":
+    ["sentence", ["with",
+      ["over-weekend", "mixed-precipitation"],
+      ["temperatures-rising",
+        ["celsius", 32],
+        "thursday"]]],
+
+  "Uisge glè aotrom Diluain, agus an teòthachd as àirde a' tuiteam gu 15\u00B0F Dihaoine.":
+    ["sentence", ["with",
+      ["during", "very-light-rain", "monday"],
+      ["temperatures-valleying",
+        ["fahrenheit", 15],
+        "friday"]]],
+
+  "Sneachd aotrom Dimàirt agus Diciadain an ath sheachdain, agus an teòthachd as àirde a' tuiteam gu 0\u00B0C Didòmhnaich.":
+    ["sentence", ["with",
+      ["during", "light-snow", ["and", "tuesday", "next-wednesday"]],
+      ["temperatures-falling",
+        ["celsius", 0],
+        "sunday"]]],
+
+  "Sileadh an-diugh gu Disathairne, agus an teòthachd as àirde a' ruigsinn 100\u00B0F Diluain.":
+    ["sentence", ["with",
+      ["during",
+        "medium-precipitation",
+        ["through", "today", "saturday"]],
+      ["temperatures-peaking",
+        ["fahrenheit", 100],
+        "monday"]]],
+
+  "Sileadh measgaichte (1\u20133 òir. de shneachda) tron latha.":
+    ["sentence",
+      ["for-day",
+        ["parenthetical", "mixed-precipitation", ["inches", ["range", 1, 3]]]]],
+
+  "Sneachd trom (1\u20133 òir.)":
+    ["title", ["parenthetical", "heavy-snow", ["inches", ["range", 1, 3]]]],
+
+  "Sneachd trom (3\u20135 cm.)":
+    ["title", ["parenthetical", "heavy-snow", ["centimeters", ["range", 3, 5]]]],
+
+  "Tha cothromm ann gum bi stoirmean tàirneannaich":
+    ["title", "possible-thunderstorm"],
+
+  "Uisge trom agus stoirmean tàirneannaich":
+    ["title", ["and", "heavy-rain", "thunderstorm"]],
+
+  "Uisge glè aotrom a' tòiseachadh ann an < 1 mìon.":
+    ["sentence",
+      ["starting-in", "very-light-rain", ["less-than", ["minutes", 1]]]],
+
+  "Cha deach dad a lorg an-dràsta air sgàth 's gu bheil a h-uile stèisean-radar far loidhne'.":
+  ["sentence",["unavailable-radar", "station-offline"]]
+}

From f22703b2272bcf7f0717f2913a6f2dc8aae8af36 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 03:21:28 +0000
Subject: [PATCH 07/38] Update gd.js

---
 lib/lang/gd.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index b787267d..d2626124 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -66,13 +66,13 @@ module.exports = {
   "medium-clouds": "sgothach",
   "heavy-clouds": "sgothan trom",
   "today-morning": "madainn an-diugh",
-  "later-today-morning": "later this morning",
+  "later-today-morning": "nas anmoiche madainn an-diugh",
   "today-afternoon": "feasgar an-diugh",
-  "later-today-afternoon": "later this afternoon",
+  "later-today-afternoon": "nas anmoiche feasgar an-diugh",
   "today-evening": "feasgar an-diugh",
-  "later-today-evening": "later this evening",
+  "later-today-evening": "nas anmoiche feasgar an-diugh",
   "today-night": "a-nochd",
-  "later-today-night": "later tonight",
+  "later-today-night": "nas anmoiche a-nochd",
   "tomorrow-morning": "madainn a-màireach",
   "tomorrow-afternoon": "feasgar a-màireach",
   "tomorrow-evening": "feasgar a-màireach",

From 148a5e0160d190656d70c1969b26b3765668060a Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 03:56:36 +0000
Subject: [PATCH 08/38] Corrections in gd.json

---
 test_cases/gd.json | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/test_cases/gd.json b/test_cases/gd.json
index 5200bdad..31209173 100644
--- a/test_cases/gd.json
+++ b/test_cases/gd.json
@@ -105,17 +105,17 @@
   "Frasan sneachda a' tòiseachadh ann an 35 mion.":
     ["sentence", ["starting-in", "very-light-snow", ["minutes", 35]]],
 
-  "Uisge aotrom a' stad ann an 15 mìon.":
+  "Uisge aotrom a' stad ann an 15 mion.":
     ["sentence", ["stopping-in", "light-rain", ["minutes", 15]]],
 
-  "Flin a' tòiseachadh ann an 20 mìon., a' stad as dèidh 30 mìn.":
+  "Flin a' tòiseachadh ann an 20 mion., a' stad as dèidh 30 mion.":
     ["sentence",
       ["starting-then-stopping-later",
         "heavy-sleet",
         ["minutes", 20],
         ["minutes", 30]]],
 
-  "Uisge a' stad ann an 25 mìon., a' tòiseachadh a-rithist as dèidh 8 mìon.":
+  "Uisge a' stad ann an 25 mion., a' tòiseachadh a-rithist as dèidh 8 mion.":
     ["sentence",
       ["stopping-then-starting-later",
         "medium-rain",
@@ -126,30 +126,30 @@
   "Sgòthach fad an latha.":
     ["sentence", ["for-day", "medium-clouds"]],
 
-  "Flin a' tòiseachadh anns a' mhadainn.":
+  "Flin glè aotrom a' tòiseachadh anns a' mhadainn.":
     ["sentence", ["starting", "very-light-sleet", "morning"]],
 
-  "Gaothach gus a-nochd.":
+  "Gaothach gu a-nochd.":
     ["sentence", ["until", "medium-wind", "today-night"]],
 
-  "Sileadh trom gus an fheasgar.":
+  "Sileadh trom gu an fheasgar.":
     ["sentence", ["until", "heavy-precipitation", "afternoon"]],
 
   "Oiteag shocair anns an fheasgar.":
     ["sentence", ["during", "light-wind", "afternoon"]],
 
-  "Sneachd feasgar an-diugh agus madainn a-màireach.":
+  "Sneachd nas anmoiche feasgar an-diugh agus madainn a-màireach.":
     ["sentence", ["during",
       "medium-snow",
       ["and", "later-today-evening", "tomorrow-morning"]]],
 
-  "Uisge trom gu nas anmoiche madainn an-diugh, a' tòiseachadh a-rithist feasgar.":
+  "Uisge trom gu nas anmoiche madainn an-diugh, a' tòiseachadh a-rithist feasgar an-diugh.":
     ["sentence", ["until-starting-again",
       "heavy-rain",
       "later-today-morning",
       "today-evening"]],
 
-  "Sgothan trom a' tòiseachadh anns an fheasgar, a' maireachdainn gus an oidhche.":
+  "Sgothan trom a' tòiseachadh anns an fheasgar, a' stad a-nochd.":
     ["sentence", ["starting-continuing-until",
       "heavy-clouds",
       "evening",
@@ -160,7 +160,7 @@
       ["during", "light-sleet", "later-today-afternoon"],
       ["during", "fog", "tomorrow-morning"]]],
 
-  "Gaoth chunnartach a' tòiseachadh madainn an-diugh, a' maireachdain gus an fheasgar, agus flin madainn a-màireach.":
+  "Gaoth chunnartach a' tòiseachadh madainn an-diugh, a' stad feasgar an-diugh, agus flin madainn a-màireach.":
     ["sentence", ["and",
       ["starting-continuing-until",
         "heavy-wind",
@@ -173,8 +173,7 @@
       ["starting", "heavy-clouds", "later-today-night"],
       ["during", "heavy-snow", "tomorrow-afternoon"]]],
 
-  "Tioram a-noch agus sileadh aotrom a' tòiseachadh feasgar a-màireach, a' maireachdainn gu oidhche a-màireach.":
-  "Dry tonight and light precipitation starting tomorrow evening, continuing until tomorrow night.":
+  "Tioram a-nochd agus sileadh aotrom a' tòiseachadh feasgar a-màireach, a' stad oidhche a-màireach.":
     ["sentence", ["and",
       ["during", "low-humidity", "today-night"],
       ["starting-continuing-until",
@@ -192,7 +191,7 @@
       ["parenthetical", "light-snow", ["centimeters", 2]],
       "later-today-morning"]],
 
-  "Sneachd trom (8\u201312 òir.) tron latha.":
+  "Sneachd trom (8\u201312 òir.) fad an latha.":
     ["sentence", ["for-day",
       ["parenthetical", "heavy-snow", ["inches", ["range", 8, 12]]]]],
 
@@ -202,35 +201,35 @@
       "afternoon"]],
 
 
-  "Gun sileadh fad na seachdain, agus an teòthard as àirde a' ruigsinn 85\u00B0F a-màireach":
+  "Gun sileadh fad na seachdain, le an teòthachd as àirde a' ruigsinn 85\u00B0F a-màireach":
     ["sentence", ["with",
       ["for-week", "no-precipitation"],
       ["temperatures-peaking",
         ["fahrenheit", 85],
         "tomorrow"]]],
 
-  "Sileadh measgaichte thairis air an deireadh-sheachdain, agus an teòtachd as àirde a' ruigsinn 32\u00B0C Diardaoin.":
+  "Sileadh measgaichte thairis air an deireadh-sheachdain, le an teòthachd as àirde a' ruigsinn 32\u00B0C Diardaoin.":
     ["sentence", ["with",
       ["over-weekend", "mixed-precipitation"],
       ["temperatures-rising",
         ["celsius", 32],
         "thursday"]]],
 
-  "Uisge glè aotrom Diluain, agus an teòthachd as àirde a' tuiteam gu 15\u00B0F Dihaoine.":
+  "Uisge glè aotrom Diluain, le an teòthachd as àirde a' tuiteam gu 15\u00B0F Dihaoine.":
     ["sentence", ["with",
       ["during", "very-light-rain", "monday"],
       ["temperatures-valleying",
         ["fahrenheit", 15],
         "friday"]]],
 
-  "Sneachd aotrom Dimàirt agus Diciadain an ath sheachdain, agus an teòthachd as àirde a' tuiteam gu 0\u00B0C Didòmhnaich.":
+  "Sneachd aotrom Dimàirt agus Diciadain an ath sheachdain, le an teòthachd as àirde a' tuiteam gu 0\u00B0C Didòmhnaich.":
     ["sentence", ["with",
       ["during", "light-snow", ["and", "tuesday", "next-wednesday"]],
       ["temperatures-falling",
         ["celsius", 0],
         "sunday"]]],
 
-  "Sileadh an-diugh gu Disathairne, agus an teòthachd as àirde a' ruigsinn 100\u00B0F Diluain.":
+  "Sileadh an-diugh tro Disathairne, agus an teòthachd as àirde a' ruigsinn 100\u00B0F Diluain.":
     ["sentence", ["with",
       ["during",
         "medium-precipitation",
@@ -239,7 +238,7 @@
         ["fahrenheit", 100],
         "monday"]]],
 
-  "Sileadh measgaichte (1\u20133 òir. de shneachda) tron latha.":
+  "Sileadh measgaichte (1\u20133 òir. de shneachda) fad an latha.":
     ["sentence",
       ["for-day",
         ["parenthetical", "mixed-precipitation", ["inches", ["range", 1, 3]]]]],
@@ -256,7 +255,7 @@
   "Uisge trom agus stoirmean tàirneannaich":
     ["title", ["and", "heavy-rain", "thunderstorm"]],
 
-  "Uisge glè aotrom a' tòiseachadh ann an < 1 mìon.":
+  "Uisge glè aotrom a' tòiseachadh ann an < 1 mion.":
     ["sentence",
       ["starting-in", "very-light-rain", ["less-than", ["minutes", 1]]]],
 

From 19d1a192294b33b54884a3b00ae0925a0363a8d1 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 03:57:03 +0000
Subject: [PATCH 09/38] Corrections in gd.js

---
 lib/lang/gd.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index d2626124..c1917253 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -28,7 +28,7 @@ function strip_prefix(period) {
 
 module.exports = {
   "clear": "soilleir",
-  "no-precipitation": "chan eil sileadh ann",
+  "no-precipitation": "gun sileadh",
   "mixed-precipitation": "sileadh measgaichte",
   "possible-very-light-precipitation": "tha cothrom ann gum bi sileadh glè aotrom",
   "very-light-precipitation": "sileadh glè aotrom",
@@ -132,15 +132,15 @@ module.exports = {
     return condition + " gu " + strip_prefix(a) + ", a' tòiseachadh a-rithist " + b;
   },
   "starting-continuing-until": function(condition, a, b) {
-    return condition + " a' tòiseachadh " + a + ", a' dol gu " + strip_prefix(b);
+    return condition + " a' tòiseachadh " + a + ", a' stad " + strip_prefix(b);
   },
   "during": "$1 $2",
   "for-week": "$1 fad na seachdain",
   "over-weekend": "$1 thairis air an deireadh-sheachdain",
-  "temperatures-peaking": "teòthachd àrd suas gu $1 $2",
-  "temperatures-rising": "teòthachd àrd a' fàs gu $1 $2",
-  "temperatures-valleying": "teòthachd àrd sìoss gu $1 $2",
-  "temperatures-falling": "teòthachd àrd a' tuiteam gu $1 $2",
+  "temperatures-peaking": "an teòthachd as àirde a' ruigsinn $1 $2",
+  "temperatures-rising": "an teòthachd as àirde a' ruigsinn $1 $2",
+  "temperatures-valleying": "an teòthachd as àirde a' tuiteam gu $1 $2",
+  "temperatures-falling": "an teòthachd as àirde a' tuiteam gu $1 $2",
   // Capitalize the first letter of every word, except if that word is
   // "and". (This is a very crude bastardization of proper English titling
   // rules, but it is adequate for the purposes of this module.)

From 57d64ff06abd2e406eba2560228d6a9b149b6687 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 04:04:33 +0000
Subject: [PATCH 10/38] Correct title case in gd.json

---
 test_cases/gd.json | 50 +++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/test_cases/gd.json b/test_cases/gd.json
index 31209173..70d48c1d 100644
--- a/test_cases/gd.json
+++ b/test_cases/gd.json
@@ -2,82 +2,82 @@
   "Soilleir":
     ["title", "clear"],
 
-  "Tha cothrom ann gum bi sileadh glè aotrom":
+  "Tha Cothrom Ann Gum Bi Sileadh Glè Aotrom":
     ["title", "possible-very-light-precipitation"],
 
-  "Sileadh glè aotrom":
+  "Sileadh Glè Aotrom":
     ["title", "very-light-precipitation"],
 
-  "Tha cothrom ann gum bi sileadh ann":
+  "Tha Cothrom Ann Gum Bi Sileadh Ann":
     ["title", "possible-light-precipitation"],
 
-  "Sileadh aotrom":
+  "Sileadh Aotrom":
     ["title", "light-precipitation"],
 
   "Sileadh":
     ["title", "medium-precipitation"],
 
-  "Sileadh trom":
+  "Sileadh Trom":
     ["title", "heavy-precipitation"],
 
-  "Tha cothrom ann gum bi uisge glè aotrom":
+  "Tha Cothrom Ann Gum Bi Uisge Glè Aotrom":
     ["title", "possible-very-light-rain"],
 
-  "Uisge glè aotrom":
+  "Uisge Glè Aotrom":
     ["title", "very-light-rain"],
 
-  "Tha cothrom ann gum bi uisge aotrom":
+  "Tha Cothrom Ann Gum Bi Uisge Aotrom":
     ["title", "possible-light-rain"],
 
-  "Uisge aotrom":
+  "Uisge Aotrom":
     ["title", "light-rain"],
 
   "Uisge":
     ["title", "medium-rain"],
 
-  "Uisge trom":
+  "Uisge Trom":
     ["title", "heavy-rain"],
 
-  "Tha cothrom ann gum bi flin glè aotrom":
+  "Tha Cothrom Ann Gum Bi Flin Glè Aotrom":
     ["title", "possible-very-light-sleet"],
 
-  "Flin glè aotrom":
+  "Flin Glè Aotrom":
     ["title", "very-light-sleet"],
 
-  "Tha cothrom ann gum bi flin aotrom":
+  "Tha Cothrom Ann Gum Bi Flin Aotrom":
     ["title", "possible-light-sleet"],
 
-  "Flin aotrom":
+  "Flin Aotrom":
     ["title", "light-sleet"],
 
   "Flin":
     ["title", "medium-sleet"],
 
-  "Flin trom":
+  "Flin Trom":
     ["title", "heavy-sleet"],
 
-  "Tha cothrom ann gum bi fras sneachda":
+  "Tha Cothrom Ann Gum Bi Fras Sneachda":
     ["title", "possible-very-light-snow"],
 
-  "Frasan sneachda":
+  "Frasan Sneachda":
     ["title", "very-light-snow"],
 
-  "Tha cothrom ann gum bi sneachd aotrom":
+  "Tha Cothrom Ann Gum Bi Sneachd Aotrom":
     ["title", "possible-light-snow"],
 
-  "Sneachd aotrom":
+  "Sneachd Aotrom":
     ["title", "light-snow"],
 
   "Sneachd":
     ["title", "medium-snow"],
 
-  "Sneachd trom":
+  "Sneachd Trom":
     ["title", "heavy-snow"],
 
   "Gaothach":
     ["title", "medium-wind"],
 
-  "Goath chunnartach":
+  "Goath Chunnartach":
     ["title", "heavy-wind"],
 
   "Ceòthach":
@@ -86,16 +86,16 @@
   "Sgothach":
     ["title", "medium-clouds"],
 
-  "Sgothan trom":
+  "Sgothan Trom":
     ["title", "heavy-clouds"],
 
-  "Tioram agus gaoth aotrom":
+  "Tioram Agus Gaoth Aotrom":
     ["title", ["and", "low-humidity", "light-wind"]],
 
-  "Uisge aotrom agus gaoth chunnartach":
+  "Uisge Aotrom Agus Gaoth Chunnartach":
     ["title", ["and", "very-light-rain", "heavy-wind"]],
 
-  "Tais agus sgothan aotrom":
+  "Tais Agus Sgothan Aotrom":
     ["title", ["and", "high-humidity", "light-clouds"]],
 
 

From 8dbbfc4bcc2300ff551dd9e66b171b33bf50bd9e Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 04:07:40 +0000
Subject: [PATCH 11/38] Corrections in gd.json

---
 test_cases/gd.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test_cases/gd.json b/test_cases/gd.json
index 70d48c1d..0c7fdd7e 100644
--- a/test_cases/gd.json
+++ b/test_cases/gd.json
@@ -8,7 +8,7 @@
   "Sileadh Glè Aotrom":
     ["title", "very-light-precipitation"],
 
-  "Tha Cothrom Ann Gum Bi Sileadh Ann":
+  "Tha Cothrom Ann Gum Bi Sileadh Aotrom":
     ["title", "possible-light-precipitation"],
 
   "Sileadh Aotrom":

From 21ce99deacc44aa943eb3b1cdc36202761fa7551 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 04:08:13 +0000
Subject: [PATCH 12/38] Corrections in gd.js

---
 lib/lang/gd.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index c1917253..f32642bd 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -43,9 +43,9 @@ module.exports = {
   "medium-rain": "uisge",
   "heavy-rain": "uisge trom",
   "possible-very-light-sleet": "tha cothrom ann gum bi flin glè aotrom",
-  "very-light-sleet": "flin glè aotram",
+  "very-light-sleet": "flin glè aotrom",
   "possible-light-sleet": "tha cothrom ann gum bi flin aotrom",
-  "light-sleet": "flin aotram",
+  "light-sleet": "flin aotrom",
   "medium-sleet": "flin",
   "heavy-sleet": "flin trom",
   "possible-very-light-snow": "fras sneachda",

From 893d9651041c54fa59ea681475c76731181a305e Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 04:28:08 +0000
Subject: [PATCH 13/38] Corrections in gd.json

---
 test_cases/gd.json | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/test_cases/gd.json b/test_cases/gd.json
index 0c7fdd7e..0143466c 100644
--- a/test_cases/gd.json
+++ b/test_cases/gd.json
@@ -71,13 +71,13 @@
   "Sneachd":
     ["title", "medium-snow"],
 
-  "Sneachd Trom":
+  "Sneachda Trom":
     ["title", "heavy-snow"],
 
   "Gaothach":
     ["title", "medium-wind"],
 
-  "Goath Chunnartach":
+  "Gaoth Chunnartach":
     ["title", "heavy-wind"],
 
   "Ceòthach":
@@ -89,10 +89,10 @@
   "Sgothan Trom":
     ["title", "heavy-clouds"],
 
-  "Tioram Agus Gaoth Aotrom":
+  "Tioram Agus Oiteag shocair":
     ["title", ["and", "low-humidity", "light-wind"]],
 
-  "Uisge Aotrom Agus Gaoth Chunnartach":
+  "Uisge Glè Aotrom Agus Gaoth Chunnartach":
     ["title", ["and", "very-light-rain", "heavy-wind"]],
 
   "Tais Agus Sgothan Aotrom":
@@ -108,7 +108,7 @@
   "Uisge aotrom a' stad ann an 15 mion.":
     ["sentence", ["stopping-in", "light-rain", ["minutes", 15]]],
 
-  "Flin a' tòiseachadh ann an 20 mion., a' stad as dèidh 30 mion.":
+  "Flin trom a' tòiseachadh ann an 20 mion., a' stad as dèidh 30 mion.":
     ["sentence",
       ["starting-then-stopping-later",
         "heavy-sleet",
@@ -123,16 +123,16 @@
         ["minutes", 8]]],
 
 
-  "Sgòthach fad an latha.":
+  "Sgothach fad an latha.":
     ["sentence", ["for-day", "medium-clouds"]],
 
   "Flin glè aotrom a' tòiseachadh anns a' mhadainn.":
     ["sentence", ["starting", "very-light-sleet", "morning"]],
 
-  "Gaothach gu a-nochd.":
+  "Gaoth a' stad a-nochd.":
     ["sentence", ["until", "medium-wind", "today-night"]],
 
-  "Sileadh trom gu an fheasgar.":
+  "Sileadh trom a' stad anns an fheasgar.":
     ["sentence", ["until", "heavy-precipitation", "afternoon"]],
 
   "Oiteag shocair anns an fheasgar.":
@@ -143,7 +143,7 @@
       "medium-snow",
       ["and", "later-today-evening", "tomorrow-morning"]]],
 
-  "Uisge trom gu nas anmoiche madainn an-diugh, a' tòiseachadh a-rithist feasgar an-diugh.":
+  "Uisge trom a' stad nas anmoiche madainn an-diugh, a' tòiseachadh a-rithist feasgar an-diugh.":
     ["sentence", ["until-starting-again",
       "heavy-rain",
       "later-today-morning",
@@ -168,12 +168,12 @@
         "today-afternoon"],
       ["during", "medium-sleet", "tomorrow-morning"]]],
 
-  "Sgothan trom a' tòiseachadh nas anmoiche a-nochd agus sneachd trom feasgar a-màireach.":
+  "Sgothan trom a' tòiseachadh nas anmoiche a-nochd agus sneachds trom feasgar a-màireach.":
     ["sentence", ["and",
       ["starting", "heavy-clouds", "later-today-night"],
       ["during", "heavy-snow", "tomorrow-afternoon"]]],
 
-  "Tioram a-nochd agus sileadh aotrom a' tòiseachadh feasgar a-màireach, a' stad oidhche a-màireach.":
+  "Tioram a-nochd agus sileadh aotrom a' tòiseachadh feasgar a-màireach, a' stad an ath oidhche.":
     ["sentence", ["and",
       ["during", "low-humidity", "today-night"],
       ["starting-continuing-until",
@@ -201,7 +201,7 @@
       "afternoon"]],
 
 
-  "Gun sileadh fad na seachdain, le an teòthachd as àirde a' ruigsinn 85\u00B0F a-màireach":
+  "Gun sileadh fad na seachdain, le an teòthachd as àirde a' ruigsinn 85\u00B0F a-màireach.":
     ["sentence", ["with",
       ["for-week", "no-precipitation"],
       ["temperatures-peaking",
@@ -229,7 +229,7 @@
         ["celsius", 0],
         "sunday"]]],
 
-  "Sileadh an-diugh tro Disathairne, agus an teòthachd as àirde a' ruigsinn 100\u00B0F Diluain.":
+  "Sileadh an-diugh tro Disathairne, le an teòthachd as àirde a' ruigsinn 100\u00B0F Diluain.":
     ["sentence", ["with",
       ["during",
         "medium-precipitation",
@@ -238,18 +238,18 @@
         ["fahrenheit", 100],
         "monday"]]],
 
-  "Sileadh measgaichte (1\u20133 òir. de shneachda) fad an latha.":
+  "Sileadh measgaichte (1\u20133 òir. sneachda) fad an latha.":
     ["sentence",
       ["for-day",
         ["parenthetical", "mixed-precipitation", ["inches", ["range", 1, 3]]]]],
 
-  "Sneachd trom (1\u20133 òir.)":
+  "Sneachda trom (1\u20133 òir.)":
     ["title", ["parenthetical", "heavy-snow", ["inches", ["range", 1, 3]]]],
 
-  "Sneachd trom (3\u20135 cm.)":
+  "Sneachda trom (3\u20135 cm.)":
     ["title", ["parenthetical", "heavy-snow", ["centimeters", ["range", 3, 5]]]],
 
-  "Tha cothromm ann gum bi stoirmean tàirneannaich":
+  "Tha cothrom ann gum bi stoirmean tàirneannaich":
     ["title", "possible-thunderstorm"],
 
   "Uisge trom agus stoirmean tàirneannaich":

From 5d2dd893b3ed3143ee2790c5adab1d7f54ed2578 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 04:28:35 +0000
Subject: [PATCH 14/38] Corrections in gd.js

---
 lib/lang/gd.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index f32642bd..4c781d79 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -48,21 +48,21 @@ module.exports = {
   "light-sleet": "flin aotrom",
   "medium-sleet": "flin",
   "heavy-sleet": "flin trom",
-  "possible-very-light-snow": "fras sneachda",
+  "possible-very-light-snow": "tha cothromm ann gum bi fras sneachda",
   "very-light-snow": "frasan sneachda",
-  "possible-light-snow": "tha cothrom ann gum bi frasan sneachda",
+  "possible-light-snow": "tha cothrom ann gum bi sneachd aotrom",
   "light-snow": "sneachd aotrom",
   "medium-snow": "sneachd",
   "heavy-snow": "sneachda trom",
   "possible-thunderstorm": "tha cothrom ann gum bi stoirmean tàirneanaich",
   "thunderstorm": "stoirmean tàirneanaich",
   "light-wind": "oiteag shocair",
-  "medium-wind": "gaothach",
+  "medium-wind": "gaoth",
   "heavy-wind": "gaoth chunnartach",
   "low-humidity": "tioram",
   "high-humidity": "tais",
   "fog": "ceòthach",
-  "light-clouds": "sgotham aotrom",
+  "light-clouds": "sgothan aotrom",
   "medium-clouds": "sgothach",
   "heavy-clouds": "sgothan trom",
   "today-morning": "madainn an-diugh",
@@ -80,7 +80,7 @@ module.exports = {
   "morning": "anns a' mhadainn",
   "afternoon": "anns an fheasgar",
   "evening": "anns an fheasgar",
-  "night": "tron oidhche",
+  "night": "a-nochd",
   "today": "an-diugh",
   "tomorrow": "a-màireach",
   "sunday": "Didòmhnaich",
@@ -126,10 +126,10 @@ module.exports = {
   "for-day": "$1 fad an latha",
   "starting": "$1 a' tòiseachadh $2",
   "until": function(condition, period) {
-    return condition + " gu " + strip_prefix(period);
+    return condition + " a' stad " + strip_prefix(period);
   },
   "until-starting-again": function(condition, a, b) {
-    return condition + " gu " + strip_prefix(a) + ", a' tòiseachadh a-rithist " + b;
+    return condition + " a' stad " + strip_prefix(a) + ", a' tòiseachadh a-rithist " + b;
   },
   "starting-continuing-until": function(condition, a, b) {
     return condition + " a' tòiseachadh " + a + ", a' stad " + strip_prefix(b);
@@ -164,5 +164,5 @@ module.exports = {
     return str;
   },
   "unavailable-radar": "Cha deach dad a lorg an-dràsta air sgàth 's $1.",
-  "station-offline": "gu bheil a h-uile stèisean-radar far-loidhne",
+  "station-offline": "gu bheil a h-uile stèisean-radar far loidhne",
 };

From 000dc1031151530d757fd4f6c34394800ce18b88 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 04:37:24 +0000
Subject: [PATCH 15/38] Corrections in gd.json

---
 test_cases/gd.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test_cases/gd.json b/test_cases/gd.json
index 0143466c..a0764f8b 100644
--- a/test_cases/gd.json
+++ b/test_cases/gd.json
@@ -74,7 +74,7 @@
   "Sneachda Trom":
     ["title", "heavy-snow"],
 
-  "Gaothach":
+  "Gaoth":
     ["title", "medium-wind"],
 
   "Gaoth Chunnartach":
@@ -89,7 +89,7 @@
   "Sgothan Trom":
     ["title", "heavy-clouds"],
 
-  "Tioram Agus Oiteag shocair":
+  "Tioram Agus Oiteag Shocair":
     ["title", ["and", "low-humidity", "light-wind"]],
 
   "Uisge Glè Aotrom Agus Gaoth Chunnartach":
@@ -168,7 +168,7 @@
         "today-afternoon"],
       ["during", "medium-sleet", "tomorrow-morning"]]],
 
-  "Sgothan trom a' tòiseachadh nas anmoiche a-nochd agus sneachds trom feasgar a-màireach.":
+  "Sgothan trom a' tòiseachadh nas anmoiche a-nochd agus sneachda trom feasgar a-màireach.":
     ["sentence", ["and",
       ["starting", "heavy-clouds", "later-today-night"],
       ["during", "heavy-snow", "tomorrow-afternoon"]]],
@@ -181,7 +181,7 @@
         "tomorrow-evening",
         "tomorrow-night"]]],
 
-  "Sneachd (5 òir.) tron oidhche.":
+  "Sneachd (5 òir.) a-nochd.":
     ["sentence", ["during",
       ["parenthetical", "medium-snow", ["inches", 5]],
       "night"]],
@@ -191,7 +191,7 @@
       ["parenthetical", "light-snow", ["centimeters", 2]],
       "later-today-morning"]],
 
-  "Sneachd trom (8\u201312 òir.) fad an latha.":
+  "Sneachda trom (8\u201312 òir.) fad an latha.":
     ["sentence", ["for-day",
       ["parenthetical", "heavy-snow", ["inches", ["range", 8, 12]]]]],
 
@@ -259,6 +259,6 @@
     ["sentence",
       ["starting-in", "very-light-rain", ["less-than", ["minutes", 1]]]],
 
-  "Cha deach dad a lorg an-dràsta air sgàth 's gu bheil a h-uile stèisean-radar far loidhne'.":
+  "Cha deach dad a lorg an-dràsta air sgàth 's gu bheil a h-uile stèisean-radar far loidhne.":
   ["sentence",["unavailable-radar", "station-offline"]]
 }

From be484ea66a2ff72573e237c488814d4d537df2d1 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 04:37:55 +0000
Subject: [PATCH 16/38] Corrections in gd.js

---
 lib/lang/gd.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index 4c781d79..325d604e 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -48,7 +48,7 @@ module.exports = {
   "light-sleet": "flin aotrom",
   "medium-sleet": "flin",
   "heavy-sleet": "flin trom",
-  "possible-very-light-snow": "tha cothromm ann gum bi fras sneachda",
+  "possible-very-light-snow": "tha cothrom ann gum bi fras sneachda",
   "very-light-snow": "frasan sneachda",
   "possible-light-snow": "tha cothrom ann gum bi sneachd aotrom",
   "light-snow": "sneachd aotrom",

From 5c18a140789ad3c7b7a97fc448f651752ea70b12 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 04:41:21 +0000
Subject: [PATCH 17/38] Corrections in gd.json

---
 test_cases/gd.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test_cases/gd.json b/test_cases/gd.json
index a0764f8b..9908b8a2 100644
--- a/test_cases/gd.json
+++ b/test_cases/gd.json
@@ -243,16 +243,16 @@
       ["for-day",
         ["parenthetical", "mixed-precipitation", ["inches", ["range", 1, 3]]]]],
 
-  "Sneachda trom (1\u20133 òir.)":
+  "Sneachda Trom (1\u20133 òir.)":
     ["title", ["parenthetical", "heavy-snow", ["inches", ["range", 1, 3]]]],
 
-  "Sneachda trom (3\u20135 cm.)":
+  "Sneachda Trom (3\u20135 cm.)":
     ["title", ["parenthetical", "heavy-snow", ["centimeters", ["range", 3, 5]]]],
 
-  "Tha cothrom ann gum bi stoirmean tàirneannaich":
+  "Tha Cothrom Ann Gum Bi Stoirmean Tàirneannaich":
     ["title", "possible-thunderstorm"],
 
-  "Uisge trom agus stoirmean tàirneannaich":
+  "Uisge Trom Agus Stoirmean Tàirneannaich":
     ["title", ["and", "heavy-rain", "thunderstorm"]],
 
   "Uisge glè aotrom a' tòiseachadh ann an < 1 mion.":

From 72870b3259b2c57c0aa2ab6f9df10ef0dc4812c9 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 04:46:10 +0000
Subject: [PATCH 18/38] Corrections in gd.json

---
 test_cases/gd.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test_cases/gd.json b/test_cases/gd.json
index 9908b8a2..629721e9 100644
--- a/test_cases/gd.json
+++ b/test_cases/gd.json
@@ -249,10 +249,10 @@
   "Sneachda Trom (3\u20135 cm.)":
     ["title", ["parenthetical", "heavy-snow", ["centimeters", ["range", 3, 5]]]],
 
-  "Tha Cothrom Ann Gum Bi Stoirmean Tàirneannaich":
+  "Tha Cothrom Ann Gum Bi Stoirmean Tàirneanaich":
     ["title", "possible-thunderstorm"],
 
-  "Uisge Trom Agus Stoirmean Tàirneannaich":
+  "Uisge Trom Agus Stoirmean Tàirneanaich":
     ["title", ["and", "heavy-rain", "thunderstorm"]],
 
   "Uisge glè aotrom a' tòiseachadh ann an < 1 mion.":

From f3294f9fb637f848dc0abad9db9a11ce958dfe99 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 06:02:08 +0000
Subject: [PATCH 19/38] Update gd.js

---
 lib/lang/gd.js | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index 325d604e..caaa3e84 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -30,31 +30,31 @@ module.exports = {
   "clear": "soilleir",
   "no-precipitation": "gun sileadh",
   "mixed-precipitation": "sileadh measgaichte",
-  "possible-very-light-precipitation": "tha cothrom ann gum bi sileadh glè aotrom",
+  "possible-very-light-precipitation": "tha cothrom ann gum bi sileadh glè aotrom ann",
   "very-light-precipitation": "sileadh glè aotrom",
-  "possible-light-precipitation": "tha cothrom ann gum bi sileadh aotrom",
+  "possible-light-precipitation": "tha cothrom ann gum bi sileadh aotrom ann",
   "light-precipitation": "sileadh aotrom",
   "medium-precipitation": "sileadh",
   "heavy-precipitation": "sileadh trom",
-  "possible-very-light-rain": "tha cothrom ann gum bi uisge glè aotrom",
+  "possible-very-light-rain": "tha cothrom ann gum bi uisge glè aotrom ann",
   "very-light-rain": "uisge glè aotrom",
-  "possible-light-rain": "tha cothrom ann gum bi uisge aotrom",
+  "possible-light-rain": "tha cothrom ann gum bi uisge aotrom ann",
   "light-rain": "uisge aotrom",
   "medium-rain": "uisge",
   "heavy-rain": "uisge trom",
-  "possible-very-light-sleet": "tha cothrom ann gum bi flin glè aotrom",
+  "possible-very-light-sleet": "tha cothrom ann gum bi flin glè aotrom ann",
   "very-light-sleet": "flin glè aotrom",
-  "possible-light-sleet": "tha cothrom ann gum bi flin aotrom",
+  "possible-light-sleet": "tha cothrom ann gum bi flin aotrom ann",
   "light-sleet": "flin aotrom",
   "medium-sleet": "flin",
   "heavy-sleet": "flin trom",
-  "possible-very-light-snow": "tha cothrom ann gum bi fras sneachda",
+  "possible-very-light-snow": "tha cothrom ann gum bi fras sneachda ann",
   "very-light-snow": "frasan sneachda",
-  "possible-light-snow": "tha cothrom ann gum bi sneachd aotrom",
+  "possible-light-snow": "tha cothrom ann gum bi sneachd aotrom ann",
   "light-snow": "sneachd aotrom",
   "medium-snow": "sneachd",
   "heavy-snow": "sneachda trom",
-  "possible-thunderstorm": "tha cothrom ann gum bi stoirmean tàirneanaich",
+  "possible-thunderstorm": "tha cothrom ann gum bi stoirmean tàirneanaich ann",
   "thunderstorm": "stoirmean tàirneanaich",
   "light-wind": "oiteag shocair",
   "medium-wind": "gaoth",
@@ -145,12 +145,11 @@ module.exports = {
   // "and". (This is a very crude bastardization of proper English titling
   // rules, but it is adequate for the purposes of this module.)
   "title": function(str) {
-    return str.replace(
-      /\b(?:a(?!nd\b)|c(?!m\.)|i(?!n\.)|[^\Waci])/g,
-      function(letter) {
-        return letter.toUpperCase();
-      }
-    );
+    return str.replace(/\S+/g, function(word) {
+      return word === "agus" ?
+        word :
+        word.charAt(0).toUpperCase() + word.slice(1);
+    });
   },
   /* Capitalize the first word of the sentence and end with a period. */
   "sentence": function(str) {

From 46d16526e3bb5e660dcc4fb9f17674404091824e Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 06:02:36 +0000
Subject: [PATCH 20/38] Update gd.json

---
 test_cases/gd.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/test_cases/gd.json b/test_cases/gd.json
index 629721e9..903fa2b4 100644
--- a/test_cases/gd.json
+++ b/test_cases/gd.json
@@ -2,13 +2,13 @@
   "Soilleir":
     ["title", "clear"],
 
-  "Tha Cothrom Ann Gum Bi Sileadh Glè Aotrom":
+  "Tha Cothrom Ann Gum Bi Sileadh Glè Aotrom Ann":
     ["title", "possible-very-light-precipitation"],
 
   "Sileadh Glè Aotrom":
     ["title", "very-light-precipitation"],
 
-  "Tha Cothrom Ann Gum Bi Sileadh Aotrom":
+  "Tha Cothrom Ann Gum Bi Sileadh Aotrom Ann":
     ["title", "possible-light-precipitation"],
 
   "Sileadh Aotrom":
@@ -20,13 +20,13 @@
   "Sileadh Trom":
     ["title", "heavy-precipitation"],
 
-  "Tha Cothrom Ann Gum Bi Uisge Glè Aotrom":
+  "Tha Cothrom Ann Gum Bi Uisge Glè Aotrom Ann":
     ["title", "possible-very-light-rain"],
 
   "Uisge Glè Aotrom":
     ["title", "very-light-rain"],
 
-  "Tha Cothrom Ann Gum Bi Uisge Aotrom":
+  "Tha Cothrom Ann Gum Bi Uisge Aotrom Ann":
     ["title", "possible-light-rain"],
 
   "Uisge Aotrom":
@@ -38,13 +38,13 @@
   "Uisge Trom":
     ["title", "heavy-rain"],
 
-  "Tha Cothrom Ann Gum Bi Flin Glè Aotrom":
+  "Tha Cothrom Ann Gum Bi Flin Glè Aotrom Ann":
     ["title", "possible-very-light-sleet"],
 
   "Flin Glè Aotrom":
     ["title", "very-light-sleet"],
 
-  "Tha Cothrom Ann Gum Bi Flin Aotrom":
+  "Tha Cothrom Ann Gum Bi Flin Aotrom Ann":
     ["title", "possible-light-sleet"],
 
   "Flin Aotrom":
@@ -56,13 +56,13 @@
   "Flin Trom":
     ["title", "heavy-sleet"],
 
-  "Tha Cothrom Ann Gum Bi Fras Sneachda":
+  "Tha Cothrom Ann Gum Bi Fras Sneachda Ann":
     ["title", "possible-very-light-snow"],
 
   "Frasan Sneachda":
     ["title", "very-light-snow"],
 
-  "Tha Cothrom Ann Gum Bi Sneachd Aotrom":
+  "Tha Cothrom Ann Gum Bi Sneachd Aotrom Ann":
     ["title", "possible-light-snow"],
 
   "Sneachd Aotrom":
@@ -249,7 +249,7 @@
   "Sneachda Trom (3\u20135 cm.)":
     ["title", ["parenthetical", "heavy-snow", ["centimeters", ["range", 3, 5]]]],
 
-  "Tha Cothrom Ann Gum Bi Stoirmean Tàirneanaich":
+  "Tha Cothrom Ann Gum Bi Stoirmean Tàirneanaich Ann":
     ["title", "possible-thunderstorm"],
 
   "Uisge Trom Agus Stoirmean Tàirneanaich":

From 50b23321439f6bba781183d6a36b9179b6987671 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 06:09:53 +0000
Subject: [PATCH 21/38] Update gd.js

---
 lib/lang/gd.js | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index caaa3e84..dccd80f5 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -1,31 +1,19 @@
 "use strict";
 
 function join_with_shared_prefix(a, b, joiner) {
-  let m = a;
   let i = 0;
 
-  // HACK: This gets around "today through on Tuesday" or cases like it, which
-  // are incorrect in English.
-  if(m === "an-diugh" || m === "a-màireach")
-    m = "air " + m;
-
-  while(i !== m.length &&
+  while(i !== a.length &&
         i !== b.length &&
-        m.charCodeAt(i) === b.charCodeAt(i))
+        a.charCodeAt(i) === b.charCodeAt(i))
     ++i;
 
-  while(i && m.charCodeAt(i - 1) !== 32)
+  while(i && a.charCodeAt(i - 1) !== 32)
     --i;
 
   return a + joiner + b.slice(i);
 }
 
-function strip_prefix(period) {
-  return period.slice(0, 9) === "fad na h-oidhche" ? period.slice(4) :
-    period.slice(0, 7) === "ann an " ? period.slice(7) :
-      period;
-}
-
 module.exports = {
   "clear": "soilleir",
   "no-precipitation": "gun sileadh",
@@ -146,7 +134,7 @@ module.exports = {
   // rules, but it is adequate for the purposes of this module.)
   "title": function(str) {
     return str.replace(/\S+/g, function(word) {
-      return word === "agus" ?
+      return word === "Agus" ?
         word :
         word.charAt(0).toUpperCase() + word.slice(1);
     });

From f3c566d33ac35da4121ad789d31f93087ecc755f Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 06:16:02 +0000
Subject: [PATCH 22/38] Update gd.js

---
 lib/lang/gd.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index dccd80f5..bd1884e4 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -113,15 +113,9 @@ module.exports = {
   "stopping-then-starting-later": "$1 a' stad ann an $2, a' tòiseachadh a-rithist as dèidh $3",
   "for-day": "$1 fad an latha",
   "starting": "$1 a' tòiseachadh $2",
-  "until": function(condition, period) {
-    return condition + " a' stad " + strip_prefix(period);
-  },
-  "until-starting-again": function(condition, a, b) {
-    return condition + " a' stad " + strip_prefix(a) + ", a' tòiseachadh a-rithist " + b;
-  },
-  "starting-continuing-until": function(condition, a, b) {
-    return condition + " a' tòiseachadh " + a + ", a' stad " + strip_prefix(b);
-  },
+  "until": "$1 a' stad $2";
+  "until-starting-again": "$1 a' stad $2, a' tòiseachadh a-rithist $3"
+  "starting-continuing-until": "$1 a' tòiseachadh $2, a' stad $3"
   "during": "$1 $2",
   "for-week": "$1 fad na seachdain",
   "over-weekend": "$1 thairis air an deireadh-sheachdain",

From 48cc381f4d5df6b6b80a87841b993f85fd6c0a58 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 06:18:33 +0000
Subject: [PATCH 23/38] Update gd.js

---
 lib/lang/gd.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index bd1884e4..1267ad24 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -113,9 +113,9 @@ module.exports = {
   "stopping-then-starting-later": "$1 a' stad ann an $2, a' tòiseachadh a-rithist as dèidh $3",
   "for-day": "$1 fad an latha",
   "starting": "$1 a' tòiseachadh $2",
-  "until": "$1 a' stad $2";
-  "until-starting-again": "$1 a' stad $2, a' tòiseachadh a-rithist $3"
-  "starting-continuing-until": "$1 a' tòiseachadh $2, a' stad $3"
+  "until": "$1 a' stad $2",
+  "until-starting-again": "$1 a' stad $2, a' tòiseachadh a-rithist $3",
+  "starting-continuing-until": "$1 a' tòiseachadh $2, a' stad $3",
   "during": "$1 $2",
   "for-week": "$1 fad na seachdain",
   "over-weekend": "$1 thairis air an deireadh-sheachdain",

From 9e76199ec1e7b74e8646fc7c255cc6b9991e3d0a Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 06:25:20 +0000
Subject: [PATCH 24/38] Update gd.js

---
 lib/lang/gd.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index 1267ad24..cb075c56 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -103,9 +103,7 @@ module.exports = {
   },
   "with": "$1, le $2",
   "range": "$1\u2013$2",
-  "parenthetical": function(a, b) {
-    return a + " (" + b + (a === "sileadh measgaichte" ? " sneachda)" : ")");
-  },
+ "parenthetical": "$1 ($2)",
   "for-hour": "$1 fad uair a thìde",
   "starting-in": "$1 a' tòiseachadh ann an $2",
   "stopping-in": "$1 a' stad ann an $2",

From d54482bdd2aea592bc40e1ac6a41337be282f33d Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 06:26:58 +0000
Subject: [PATCH 25/38] Update gd.js

---
 lib/lang/gd.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index cb075c56..cbfb39c7 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -103,7 +103,7 @@ module.exports = {
   },
   "with": "$1, le $2",
   "range": "$1\u2013$2",
- "parenthetical": "$1 ($2)",
+  "parenthetical": "$1 ($2)",
   "for-hour": "$1 fad uair a thìde",
   "starting-in": "$1 a' tòiseachadh ann an $2",
   "stopping-in": "$1 a' stad ann an $2",

From 1dedf0d6057fb19fbc4052ba6bfe415c0d0a9fb2 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 06:32:13 +0000
Subject: [PATCH 26/38] Update gd.json

---
 test_cases/gd.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test_cases/gd.json b/test_cases/gd.json
index 903fa2b4..3bfef6e7 100644
--- a/test_cases/gd.json
+++ b/test_cases/gd.json
@@ -238,7 +238,7 @@
         ["fahrenheit", 100],
         "monday"]]],
 
-  "Sileadh measgaichte (1\u20133 òir. sneachda) fad an latha.":
+  "Sileadh measgaichte (1\u20133 òir.) fad an latha.":
     ["sentence",
       ["for-day",
         ["parenthetical", "mixed-precipitation", ["inches", ["range", 1, 3]]]]],

From 810ad1ed270b24c9c979a75146d86981bbb9d1cb Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 06:41:44 +0000
Subject: [PATCH 27/38] Update gd.json

---
 test_cases/gd.json | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/test_cases/gd.json b/test_cases/gd.json
index 3bfef6e7..418d06e9 100644
--- a/test_cases/gd.json
+++ b/test_cases/gd.json
@@ -237,28 +237,4 @@
       ["temperatures-peaking",
         ["fahrenheit", 100],
         "monday"]]],
-
-  "Sileadh measgaichte (1\u20133 òir.) fad an latha.":
-    ["sentence",
-      ["for-day",
-        ["parenthetical", "mixed-precipitation", ["inches", ["range", 1, 3]]]]],
-
-  "Sneachda Trom (1\u20133 òir.)":
-    ["title", ["parenthetical", "heavy-snow", ["inches", ["range", 1, 3]]]],
-
-  "Sneachda Trom (3\u20135 cm.)":
-    ["title", ["parenthetical", "heavy-snow", ["centimeters", ["range", 3, 5]]]],
-
-  "Tha Cothrom Ann Gum Bi Stoirmean Tàirneanaich Ann":
-    ["title", "possible-thunderstorm"],
-
-  "Uisge Trom Agus Stoirmean Tàirneanaich":
-    ["title", ["and", "heavy-rain", "thunderstorm"]],
-
-  "Uisge glè aotrom a' tòiseachadh ann an < 1 mion.":
-    ["sentence",
-      ["starting-in", "very-light-rain", ["less-than", ["minutes", 1]]]],
-
-  "Cha deach dad a lorg an-dràsta air sgàth 's gu bheil a h-uile stèisean-radar far loidhne.":
-  ["sentence",["unavailable-radar", "station-offline"]]
 }

From a668b9022b3d74d21237f41745a376fea2b18e0a Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Tue, 31 Dec 2019 06:47:02 +0000
Subject: [PATCH 28/38] Update gd.json

---
 test_cases/gd.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test_cases/gd.json b/test_cases/gd.json
index 418d06e9..e3cd216e 100644
--- a/test_cases/gd.json
+++ b/test_cases/gd.json
@@ -237,4 +237,10 @@
       ["temperatures-peaking",
         ["fahrenheit", 100],
         "monday"]]],
+
+  "Tha cothrom ann gum bi stoirmean tàirneanaich ann Diciadain an ath sheachdain agus Diardaoin an ath sheachdain.":
+    ["sentence", ["during",
+      "possible-thunderstorm",
+        ["and", "next-wednesday", "next-thursday"]
+    ]]
 }

From f4dfd88f66d5155fc8c932b7140a2875991608e0 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Mon, 6 Jan 2020 18:59:26 +0000
Subject: [PATCH 29/38] Removed extra space

---
 lib/lang/gd.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index cbfb39c7..4c2b0bc5 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -84,7 +84,7 @@ module.exports = {
   "next-wednesday": "Diciadain an ath sheachdain",
   "next-thursday": "Diardaoin an ath sheachdain",
   "next-friday": "Dihaoine an ath sheachdain",
-  "next-saturday": "Disathairne  an ath sheachdain",
+  "next-saturday": "Disathairne an ath sheachdain",
   "minutes": "$1 mion.",
   "fahrenheit": "$1\u00B0F",
   "celsius": "$1\u00B0C",

From a89bdbeb15f17c0edcaacdb7e594caa3a0741849 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Sat, 18 Jan 2020 10:41:00 +0000
Subject: [PATCH 30/38] Clean up Scottish Gaelic translation

---
 test_cases/gd.json | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/test_cases/gd.json b/test_cases/gd.json
index e3cd216e..f2eeb9d3 100644
--- a/test_cases/gd.json
+++ b/test_cases/gd.json
@@ -2,13 +2,13 @@
   "Soilleir":
     ["title", "clear"],
 
-  "Tha Cothrom Ann Gum Bi Sileadh Glè Aotrom Ann":
+  "Ma Dh'fhaoidte Gu Sil I Beagan":
     ["title", "possible-very-light-precipitation"],
 
   "Sileadh Glè Aotrom":
     ["title", "very-light-precipitation"],
 
-  "Tha Cothrom Ann Gum Bi Sileadh Aotrom Ann":
+  "Ma Dh'fhaoidte Gu Sil I":
     ["title", "possible-light-precipitation"],
 
   "Sileadh Aotrom":
@@ -20,13 +20,13 @@
   "Sileadh Trom":
     ["title", "heavy-precipitation"],
 
-  "Tha Cothrom Ann Gum Bi Uisge Glè Aotrom Ann":
+  "Ma Dh'fhaoidte Gum Bi Uisge Glè Aotrom":
     ["title", "possible-very-light-rain"],
 
   "Uisge Glè Aotrom":
     ["title", "very-light-rain"],
 
-  "Tha Cothrom Ann Gum Bi Uisge Aotrom Ann":
+  "Ma Dh'fhaoidte Gum Bi Uisge Aotrom":
     ["title", "possible-light-rain"],
 
   "Uisge Aotrom":
@@ -38,13 +38,13 @@
   "Uisge Trom":
     ["title", "heavy-rain"],
 
-  "Tha Cothrom Ann Gum Bi Flin Glè Aotrom Ann":
+  "Ma Dh'fhaoidte Gum Bi Frasan Flin":
     ["title", "possible-very-light-sleet"],
 
   "Flin Glè Aotrom":
     ["title", "very-light-sleet"],
 
-  "Tha Cothrom Ann Gum Bi Flin Aotrom Ann":
+  "Ma Dh'fhaoidte Gum Bi Flin":
     ["title", "possible-light-sleet"],
 
   "Flin Aotrom":
@@ -56,13 +56,13 @@
   "Flin Trom":
     ["title", "heavy-sleet"],
 
-  "Tha Cothrom Ann Gum Bi Fras Sneachda Ann":
+  "Ma Dh'fhaoidte Gum Bi Frasan Sneachda":
     ["title", "possible-very-light-snow"],
 
   "Frasan Sneachda":
     ["title", "very-light-snow"],
 
-  "Tha Cothrom Ann Gum Bi Sneachd Aotrom Ann":
+  "Ma Dh'fhaoidte Gun Cur I Sneachda":
     ["title", "possible-light-snow"],
 
   "Sneachd Aotrom":
@@ -77,7 +77,7 @@
   "Gaoth":
     ["title", "medium-wind"],
 
-  "Gaoth Chunnartach":
+  "Gaoth Làidir":
     ["title", "heavy-wind"],
 
   "Ceòthach":
@@ -86,19 +86,18 @@
   "Sgothach":
     ["title", "medium-clouds"],
 
-  "Sgothan Trom":
+  "Sgothan Truime":
     ["title", "heavy-clouds"],
 
   "Tioram Agus Oiteag Shocair":
     ["title", ["and", "low-humidity", "light-wind"]],
 
-  "Uisge Glè Aotrom Agus Gaoth Chunnartach":
+  "Uisge Glè Aotrom Agus Gaoth Làidir":
     ["title", ["and", "very-light-rain", "heavy-wind"]],
 
-  "Tais Agus Sgothan Aotrom":
+  "Tais Agus Sgothan Aotruime":
     ["title", ["and", "high-humidity", "light-clouds"]],
 
-
   "Soilleir fad uair a thìde.":
     ["sentence", ["for-hour", "clear"]],
 
@@ -122,20 +121,19 @@
         ["minutes", 25],
         ["minutes", 8]]],
 
-
   "Sgothach fad an latha.":
     ["sentence", ["for-day", "medium-clouds"]],
 
-  "Flin glè aotrom a' tòiseachadh anns a' mhadainn.":
+  "Frasan flin a' tòiseachadh anns a' mhadainn.":
     ["sentence", ["starting", "very-light-sleet", "morning"]],
 
   "Gaoth a' stad a-nochd.":
     ["sentence", ["until", "medium-wind", "today-night"]],
 
-  "Sileadh trom a' stad anns an fheasgar.":
+  "Sileadh trom a' stad tràth san fheasgar.":
     ["sentence", ["until", "heavy-precipitation", "afternoon"]],
 
-  "Oiteag shocair anns an fheasgar.":
+  "Oiteag shocair tràth san fheasgar.":
     ["sentence", ["during", "light-wind", "afternoon"]],
 
   "Sneachd nas anmoiche feasgar an-diugh agus madainn a-màireach.":
@@ -143,13 +141,13 @@
       "medium-snow",
       ["and", "later-today-evening", "tomorrow-morning"]]],
 
-  "Uisge trom a' stad nas anmoiche madainn an-diugh, a' tòiseachadh a-rithist feasgar an-diugh.":
+  "Uisge trom a' stad nas anmoiche madainn an-diugh, a' tòiseachadh a-rithist anmoch feasgar an-diugh.":
     ["sentence", ["until-starting-again",
       "heavy-rain",
       "later-today-morning",
       "today-evening"]],
 
-  "Sgothan trom a' tòiseachadh anns an fheasgar, a' stad a-nochd.":
+  "Sgothan truime a' tòiseachadh anmoch san fheasgar, a' stad a-nochd.":
     ["sentence", ["starting-continuing-until",
       "heavy-clouds",
       "evening",
@@ -160,7 +158,7 @@
       ["during", "light-sleet", "later-today-afternoon"],
       ["during", "fog", "tomorrow-morning"]]],
 
-  "Gaoth chunnartach a' tòiseachadh madainn an-diugh, a' stad feasgar an-diugh, agus flin madainn a-màireach.":
+  "Gaoth làidir a' tòiseachadh madainn an-diugh, a' stad tràth feasgar an-diugh, agus flin madainn a-màireach.":
     ["sentence", ["and",
       ["starting-continuing-until",
         "heavy-wind",
@@ -168,12 +166,12 @@
         "today-afternoon"],
       ["during", "medium-sleet", "tomorrow-morning"]]],
 
-  "Sgothan trom a' tòiseachadh nas anmoiche a-nochd agus sneachda trom feasgar a-màireach.":
+  "Sgothan truime a' tòiseachadh nas anmoiche a-nochd agus sneachda trom tràth feasgar a-màireach.":
     ["sentence", ["and",
       ["starting", "heavy-clouds", "later-today-night"],
       ["during", "heavy-snow", "tomorrow-afternoon"]]],
 
-  "Tioram a-nochd agus sileadh aotrom a' tòiseachadh feasgar a-màireach, a' stad an ath oidhche.":
+  "Tioram a-nochd agus sileadh aotrom a' tòiseachadh anmoch feasgar a-màireach, a' stad an ath oidhche.":
     ["sentence", ["and",
       ["during", "low-humidity", "today-night"],
       ["starting-continuing-until",
@@ -195,7 +193,7 @@
     ["sentence", ["for-day",
       ["parenthetical", "heavy-snow", ["inches", ["range", 8, 12]]]]],
 
-  "Sneachd (< 1 cm.) anns an fheasgar.":
+  "Sneachd (< 1 cm.) tràth san fheasgar.":
     ["sentence", ["during",
       ["parenthetical", "medium-snow", ["less-than", ["centimeters", 1]]],
       "afternoon"]],
@@ -238,7 +236,7 @@
         ["fahrenheit", 100],
         "monday"]]],
 
-  "Tha cothrom ann gum bi stoirmean tàirneanaich ann Diciadain an ath sheachdain agus Diardaoin an ath sheachdain.":
+  "Ma dh'fhaoidte gum bi stoirmean tàirneanaich Diciadain an ath sheachdain agus Diardaoin an ath sheachdain.":
     ["sentence", ["during",
       "possible-thunderstorm",
         ["and", "next-wednesday", "next-thursday"]

From f19edc486245f85b826f3fdce797f62284a03533 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Sat, 18 Jan 2020 10:42:04 +0000
Subject: [PATCH 31/38] Clean up Scottish Gaelic translation

---
 lib/lang/gd.js | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index 4c2b0bc5..1e9efcfb 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -18,56 +18,56 @@ module.exports = {
   "clear": "soilleir",
   "no-precipitation": "gun sileadh",
   "mixed-precipitation": "sileadh measgaichte",
-  "possible-very-light-precipitation": "tha cothrom ann gum bi sileadh glè aotrom ann",
+  "possible-very-light-precipitation": "ma dh'fhaoidte gu sil i beagan",
   "very-light-precipitation": "sileadh glè aotrom",
-  "possible-light-precipitation": "tha cothrom ann gum bi sileadh aotrom ann",
+  "possible-light-precipitation": "ma dh'fhaoidte gu sil i",
   "light-precipitation": "sileadh aotrom",
   "medium-precipitation": "sileadh",
   "heavy-precipitation": "sileadh trom",
-  "possible-very-light-rain": "tha cothrom ann gum bi uisge glè aotrom ann",
+  "possible-very-light-rain": "ma dh'fhaoidte gum bi uisge glè aotrom",
   "very-light-rain": "uisge glè aotrom",
-  "possible-light-rain": "tha cothrom ann gum bi uisge aotrom ann",
+  "possible-light-rain": "ma dh'fhaoidte gum bi uisge aotrom",
   "light-rain": "uisge aotrom",
   "medium-rain": "uisge",
   "heavy-rain": "uisge trom",
-  "possible-very-light-sleet": "tha cothrom ann gum bi flin glè aotrom ann",
-  "very-light-sleet": "flin glè aotrom",
-  "possible-light-sleet": "tha cothrom ann gum bi flin aotrom ann",
+  "possible-very-light-sleet": "ma dh'fhaoidte gum bi frasan flin",
+  "very-light-sleet": "frasan flin",
+  "possible-light-sleet": "ma dh'fhaoidte gum bi flin aotrom",
   "light-sleet": "flin aotrom",
   "medium-sleet": "flin",
   "heavy-sleet": "flin trom",
-  "possible-very-light-snow": "tha cothrom ann gum bi fras sneachda ann",
+  "possible-very-light-snow": "ma dh'fhaoidte gum bi frasan sneachda",
   "very-light-snow": "frasan sneachda",
-  "possible-light-snow": "tha cothrom ann gum bi sneachd aotrom ann",
+  "possible-light-snow": "ma dh'fhaoidte gun cur i sneachda",
   "light-snow": "sneachd aotrom",
   "medium-snow": "sneachd",
   "heavy-snow": "sneachda trom",
-  "possible-thunderstorm": "tha cothrom ann gum bi stoirmean tàirneanaich ann",
+  "possible-thunderstorm": "ma dh'fhaoidte gum bi stoirmean tàirneanaich",
   "thunderstorm": "stoirmean tàirneanaich",
   "light-wind": "oiteag shocair",
   "medium-wind": "gaoth",
-  "heavy-wind": "gaoth chunnartach",
+  "heavy-wind": "gaoth làidir",
   "low-humidity": "tioram",
   "high-humidity": "tais",
   "fog": "ceòthach",
-  "light-clouds": "sgothan aotrom",
+  "light-clouds": "sgothan aotruime",
   "medium-clouds": "sgothach",
-  "heavy-clouds": "sgothan trom",
+  "heavy-clouds": "sgothan truime",
   "today-morning": "madainn an-diugh",
   "later-today-morning": "nas anmoiche madainn an-diugh",
-  "today-afternoon": "feasgar an-diugh",
+  "today-afternoon": "tràth feasgar an-diugh",
   "later-today-afternoon": "nas anmoiche feasgar an-diugh",
-  "today-evening": "feasgar an-diugh",
+  "today-evening": "anmoch feasgar an-diugh",
   "later-today-evening": "nas anmoiche feasgar an-diugh",
   "today-night": "a-nochd",
   "later-today-night": "nas anmoiche a-nochd",
   "tomorrow-morning": "madainn a-màireach",
-  "tomorrow-afternoon": "feasgar a-màireach",
-  "tomorrow-evening": "feasgar a-màireach",
+  "tomorrow-afternoon": "tràth feasgar a-màireach",
+  "tomorrow-evening": "anmoch feasgar a-màireach",
   "tomorrow-night": "an ath oidhche",
   "morning": "anns a' mhadainn",
-  "afternoon": "anns an fheasgar",
-  "evening": "anns an fheasgar",
+  "afternoon": "tràth san fheasgar",
+  "evening": "anmoch san fheasgar",
   "night": "a-nochd",
   "today": "an-diugh",
   "tomorrow": "a-màireach",

From 780c3080e28f629506c2f64d463493c19f5cdc02 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Sat, 18 Jan 2020 10:47:19 +0000
Subject: [PATCH 32/38] Clean up Scottish Gaelic translation

---
 test_cases/gd.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test_cases/gd.json b/test_cases/gd.json
index f2eeb9d3..0040165e 100644
--- a/test_cases/gd.json
+++ b/test_cases/gd.json
@@ -41,10 +41,10 @@
   "Ma Dh'fhaoidte Gum Bi Frasan Flin":
     ["title", "possible-very-light-sleet"],
 
-  "Flin Glè Aotrom":
+  "Frasan Flin":
     ["title", "very-light-sleet"],
 
-  "Ma Dh'fhaoidte Gum Bi Flin":
+  "Ma Dh'fhaoidte Gum Bi Flin Aotrom":
     ["title", "possible-light-sleet"],
 
   "Flin Aotrom":

From e7833ef6c0c9571c646141ae6d5cfa7d95b98065 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Sat, 18 Jan 2020 14:27:22 +0000
Subject: [PATCH 33/38] Add status properties in Scottish Gaelic

---
 test_cases/gd.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/test_cases/gd.json b/test_cases/gd.json
index 0040165e..6b5c3735 100644
--- a/test_cases/gd.json
+++ b/test_cases/gd.json
@@ -240,5 +240,13 @@
     ["sentence", ["during",
       "possible-thunderstorm",
         ["and", "next-wednesday", "next-thursday"]
-    ]]
+    ]],
+  "Chan eil ro-aithrisean an ath uair ri fhaoitinn airson grèis air sgàth 's gu bheil gu bheil a h-uile stèisean-radar a tha faisg air làimh far loidhne.":
+    ["sentence", ["next-hour-forecast-status", "temporarily-unavailable", "station-offline"]],
+
+  "Chan eil ro-aithrisean an ath uair ri fhaoitinn gu h-iomlan air sgàth 's gu bheil beàrnan anns an fhiosrachadh bho na stèisean-radar a tha faisg air làimh.":
+    ["sentence", ["next-hour-forecast-status", "partially-unavailable", "station-incomplete"]],
+
+  "Chan eil ro-aithrisean an ath uair ri fhaoitinn air sgàth 's gu bheil gu bheil a h-uile stèisean-radar a tha faisg air làimh far loidhne":
+    ["sentence", ["next-hour-forecast-status", "unavailable", "station-offline"]]
 }

From 063cc0a6b6838a585cec91dfef8526a06cebe106 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Sat, 18 Jan 2020 14:27:57 +0000
Subject: [PATCH 34/38] Add status properties in Scottish Gaelic

---
 lib/lang/gd.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index 1e9efcfb..8b23c6e0 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -142,6 +142,10 @@ module.exports = {
 
     return str;
   },
-  "unavailable-radar": "Cha deach dad a lorg an-dràsta air sgàth 's $1.",
-  "station-offline": "gu bheil a h-uile stèisean-radar far loidhne",
+  "next-hour-forecast-status": "Chan eil ro-aithrisean an ath uair $1 air sgàth 's gu bheil $2",
+  "unavailable": "ri fhaoitinn",
+  "temporarily-unavailable": "ri fhaoitinn airson grèis",
+  "partially-unavailable": "ri fhaoitinn gu h-iomlan",
+  "station-offline": "gu bheil a h-uile stèisean-radar a tha faisg air làimh far loidhne",
+  "station-incomplete": "beàrnan anns an fhiosrachadh bho na stèisean-radar a tha faisg air làimh",
 };

From 00a7ed87f8de2cf903a5954aa91ab4e33586e02b Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Sat, 18 Jan 2020 14:33:47 +0000
Subject: [PATCH 35/38] Add status properties in Scottish Gaelic

---
 lib/lang/gd.js | 393 +++++++++++++++++++++++++++++++------------------
 1 file changed, 247 insertions(+), 146 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index 8b23c6e0..c944f981 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -1,151 +1,252 @@
-"use strict";
+{
+  "Soilleir":
+    ["title", "clear"],
 
-function join_with_shared_prefix(a, b, joiner) {
-  let i = 0;
+  "Ma Dh'fhaoidte Gu Sil I Beagan":
+    ["title", "possible-very-light-precipitation"],
 
-  while(i !== a.length &&
-        i !== b.length &&
-        a.charCodeAt(i) === b.charCodeAt(i))
-    ++i;
+  "Sileadh Glè Aotrom":
+    ["title", "very-light-precipitation"],
 
-  while(i && a.charCodeAt(i - 1) !== 32)
-    --i;
+  "Ma Dh'fhaoidte Gu Sil I":
+    ["title", "possible-light-precipitation"],
 
-  return a + joiner + b.slice(i);
-}
+  "Sileadh Aotrom":
+    ["title", "light-precipitation"],
+
+  "Sileadh":
+    ["title", "medium-precipitation"],
+
+  "Sileadh Trom":
+    ["title", "heavy-precipitation"],
+
+  "Ma Dh'fhaoidte Gum Bi Uisge Glè Aotrom":
+    ["title", "possible-very-light-rain"],
+
+  "Uisge Glè Aotrom":
+    ["title", "very-light-rain"],
+
+  "Ma Dh'fhaoidte Gum Bi Uisge Aotrom":
+    ["title", "possible-light-rain"],
+
+  "Uisge Aotrom":
+    ["title", "light-rain"],
+
+  "Uisge":
+    ["title", "medium-rain"],
+
+  "Uisge Trom":
+    ["title", "heavy-rain"],
+
+  "Ma Dh'fhaoidte Gum Bi Frasan Flin":
+    ["title", "possible-very-light-sleet"],
+
+  "Frasan Flin":
+    ["title", "very-light-sleet"],
+
+  "Ma Dh'fhaoidte Gum Bi Flin Aotrom":
+    ["title", "possible-light-sleet"],
+
+  "Flin Aotrom":
+    ["title", "light-sleet"],
+
+  "Flin":
+    ["title", "medium-sleet"],
+
+  "Flin Trom":
+    ["title", "heavy-sleet"],
+
+  "Ma Dh'fhaoidte Gum Bi Frasan Sneachda":
+    ["title", "possible-very-light-snow"],
+
+  "Frasan Sneachda":
+    ["title", "very-light-snow"],
+
+  "Ma Dh'fhaoidte Gun Cur I Sneachda":
+    ["title", "possible-light-snow"],
+
+  "Sneachd Aotrom":
+    ["title", "light-snow"],
+
+  "Sneachd":
+    ["title", "medium-snow"],
+
+  "Sneachda Trom":
+    ["title", "heavy-snow"],
+
+  "Gaoth":
+    ["title", "medium-wind"],
+
+  "Gaoth Làidir":
+    ["title", "heavy-wind"],
+
+  "Ceòthach":
+    ["title", "fog"],
+
+  "Sgothach":
+    ["title", "medium-clouds"],
+
+  "Sgothan Truime":
+    ["title", "heavy-clouds"],
+
+  "Tioram Agus Oiteag Shocair":
+    ["title", ["and", "low-humidity", "light-wind"]],
+
+  "Uisge Glè Aotrom Agus Gaoth Làidir":
+    ["title", ["and", "very-light-rain", "heavy-wind"]],
+
+  "Tais Agus Sgothan Aotruime":
+    ["title", ["and", "high-humidity", "light-clouds"]],
+
+  "Soilleir fad uair a thìde.":
+    ["sentence", ["for-hour", "clear"]],
 
-module.exports = {
-  "clear": "soilleir",
-  "no-precipitation": "gun sileadh",
-  "mixed-precipitation": "sileadh measgaichte",
-  "possible-very-light-precipitation": "ma dh'fhaoidte gu sil i beagan",
-  "very-light-precipitation": "sileadh glè aotrom",
-  "possible-light-precipitation": "ma dh'fhaoidte gu sil i",
-  "light-precipitation": "sileadh aotrom",
-  "medium-precipitation": "sileadh",
-  "heavy-precipitation": "sileadh trom",
-  "possible-very-light-rain": "ma dh'fhaoidte gum bi uisge glè aotrom",
-  "very-light-rain": "uisge glè aotrom",
-  "possible-light-rain": "ma dh'fhaoidte gum bi uisge aotrom",
-  "light-rain": "uisge aotrom",
-  "medium-rain": "uisge",
-  "heavy-rain": "uisge trom",
-  "possible-very-light-sleet": "ma dh'fhaoidte gum bi frasan flin",
-  "very-light-sleet": "frasan flin",
-  "possible-light-sleet": "ma dh'fhaoidte gum bi flin aotrom",
-  "light-sleet": "flin aotrom",
-  "medium-sleet": "flin",
-  "heavy-sleet": "flin trom",
-  "possible-very-light-snow": "ma dh'fhaoidte gum bi frasan sneachda",
-  "very-light-snow": "frasan sneachda",
-  "possible-light-snow": "ma dh'fhaoidte gun cur i sneachda",
-  "light-snow": "sneachd aotrom",
-  "medium-snow": "sneachd",
-  "heavy-snow": "sneachda trom",
-  "possible-thunderstorm": "ma dh'fhaoidte gum bi stoirmean tàirneanaich",
-  "thunderstorm": "stoirmean tàirneanaich",
-  "light-wind": "oiteag shocair",
-  "medium-wind": "gaoth",
-  "heavy-wind": "gaoth làidir",
-  "low-humidity": "tioram",
-  "high-humidity": "tais",
-  "fog": "ceòthach",
-  "light-clouds": "sgothan aotruime",
-  "medium-clouds": "sgothach",
-  "heavy-clouds": "sgothan truime",
-  "today-morning": "madainn an-diugh",
-  "later-today-morning": "nas anmoiche madainn an-diugh",
-  "today-afternoon": "tràth feasgar an-diugh",
-  "later-today-afternoon": "nas anmoiche feasgar an-diugh",
-  "today-evening": "anmoch feasgar an-diugh",
-  "later-today-evening": "nas anmoiche feasgar an-diugh",
-  "today-night": "a-nochd",
-  "later-today-night": "nas anmoiche a-nochd",
-  "tomorrow-morning": "madainn a-màireach",
-  "tomorrow-afternoon": "tràth feasgar a-màireach",
-  "tomorrow-evening": "anmoch feasgar a-màireach",
-  "tomorrow-night": "an ath oidhche",
-  "morning": "anns a' mhadainn",
-  "afternoon": "tràth san fheasgar",
-  "evening": "anmoch san fheasgar",
-  "night": "a-nochd",
-  "today": "an-diugh",
-  "tomorrow": "a-màireach",
-  "sunday": "Didòmhnaich",
-  "monday": "Diluain",
-  "tuesday": "Dimàirt",
-  "wednesday": "Diciadain",
-  "thursday": "Diardaoin",
-  "friday": "Dihaoine",
-  "saturday": "Disathairne",
-  "next-sunday": "Didòmhnaich an ath sheachdain",
-  "next-monday": "Diluain an ath sheachdain",
-  "next-tuesday": "Dimàirt an ath sheachdain",
-  "next-wednesday": "Diciadain an ath sheachdain",
-  "next-thursday": "Diardaoin an ath sheachdain",
-  "next-friday": "Dihaoine an ath sheachdain",
-  "next-saturday": "Disathairne an ath sheachdain",
-  "minutes": "$1 mion.",
-  "fahrenheit": "$1\u00B0F",
-  "celsius": "$1\u00B0C",
-  "inches": "$1 òir.",
-  "centimeters": "$1 cm.",
-  "less-than": "< $1",
-  "and": function(a, b) {
-    return join_with_shared_prefix(
-      a,
-      b,
-      a.indexOf(",") !== -1 ? ", agus " : " agus "
-    );
-  },
-  "through": function(a, b) {
-    return join_with_shared_prefix(a, b, " tro ");
-  },
-  "with": "$1, le $2",
-  "range": "$1\u2013$2",
-  "parenthetical": "$1 ($2)",
-  "for-hour": "$1 fad uair a thìde",
-  "starting-in": "$1 a' tòiseachadh ann an $2",
-  "stopping-in": "$1 a' stad ann an $2",
-  "starting-then-stopping-later": "$1 a' tòiseachadh ann an $2, a' stad as dèidh $3",
-  "stopping-then-starting-later": "$1 a' stad ann an $2, a' tòiseachadh a-rithist as dèidh $3",
-  "for-day": "$1 fad an latha",
-  "starting": "$1 a' tòiseachadh $2",
-  "until": "$1 a' stad $2",
-  "until-starting-again": "$1 a' stad $2, a' tòiseachadh a-rithist $3",
-  "starting-continuing-until": "$1 a' tòiseachadh $2, a' stad $3",
-  "during": "$1 $2",
-  "for-week": "$1 fad na seachdain",
-  "over-weekend": "$1 thairis air an deireadh-sheachdain",
-  "temperatures-peaking": "an teòthachd as àirde a' ruigsinn $1 $2",
-  "temperatures-rising": "an teòthachd as àirde a' ruigsinn $1 $2",
-  "temperatures-valleying": "an teòthachd as àirde a' tuiteam gu $1 $2",
-  "temperatures-falling": "an teòthachd as àirde a' tuiteam gu $1 $2",
-  // Capitalize the first letter of every word, except if that word is
-  // "and". (This is a very crude bastardization of proper English titling
-  // rules, but it is adequate for the purposes of this module.)
-  "title": function(str) {
-    return str.replace(/\S+/g, function(word) {
-      return word === "Agus" ?
-        word :
-        word.charAt(0).toUpperCase() + word.slice(1);
-    });
-  },
-  /* Capitalize the first word of the sentence and end with a period. */
-  "sentence": function(str) {
-    /* Capitalize. */
-    str = str.charAt(0).toUpperCase() + str.slice(1);
-
-    /* Add a period if there isn't already one. */
-    if(str.charAt(str.length - 1) !== ".")
-      str += ".";
-
-    return str;
-  },
-  "next-hour-forecast-status": "Chan eil ro-aithrisean an ath uair $1 air sgàth 's gu bheil $2",
-  "unavailable": "ri fhaoitinn",
-  "temporarily-unavailable": "ri fhaoitinn airson grèis",
-  "partially-unavailable": "ri fhaoitinn gu h-iomlan",
-  "station-offline": "gu bheil a h-uile stèisean-radar a tha faisg air làimh far loidhne",
-  "station-incomplete": "beàrnan anns an fhiosrachadh bho na stèisean-radar a tha faisg air làimh",
-};
+  "Frasan sneachda a' tòiseachadh ann an 35 mion.":
+    ["sentence", ["starting-in", "very-light-snow", ["minutes", 35]]],
+
+  "Uisge aotrom a' stad ann an 15 mion.":
+    ["sentence", ["stopping-in", "light-rain", ["minutes", 15]]],
+
+  "Flin trom a' tòiseachadh ann an 20 mion., a' stad as dèidh 30 mion.":
+    ["sentence",
+      ["starting-then-stopping-later",
+        "heavy-sleet",
+        ["minutes", 20],
+        ["minutes", 30]]],
+
+  "Uisge a' stad ann an 25 mion., a' tòiseachadh a-rithist as dèidh 8 mion.":
+    ["sentence",
+      ["stopping-then-starting-later",
+        "medium-rain",
+        ["minutes", 25],
+        ["minutes", 8]]],
+
+  "Sgothach fad an latha.":
+    ["sentence", ["for-day", "medium-clouds"]],
+
+  "Frasan flin a' tòiseachadh anns a' mhadainn.":
+    ["sentence", ["starting", "very-light-sleet", "morning"]],
+
+  "Gaoth a' stad a-nochd.":
+    ["sentence", ["until", "medium-wind", "today-night"]],
+
+  "Sileadh trom a' stad tràth san fheasgar.":
+    ["sentence", ["until", "heavy-precipitation", "afternoon"]],
+
+  "Oiteag shocair tràth san fheasgar.":
+    ["sentence", ["during", "light-wind", "afternoon"]],
+
+  "Sneachd nas anmoiche feasgar an-diugh agus madainn a-màireach.":
+    ["sentence", ["during",
+      "medium-snow",
+      ["and", "later-today-evening", "tomorrow-morning"]]],
+
+  "Uisge trom a' stad nas anmoiche madainn an-diugh, a' tòiseachadh a-rithist anmoch feasgar an-diugh.":
+    ["sentence", ["until-starting-again",
+      "heavy-rain",
+      "later-today-morning",
+      "today-evening"]],
+
+  "Sgothan truime a' tòiseachadh anmoch san fheasgar, a' stad a-nochd.":
+    ["sentence", ["starting-continuing-until",
+      "heavy-clouds",
+      "evening",
+      "night"]],
+
+  "Flin aotrom nas anmoiche feasgar an-diugh agus ceòthach madainn a-màireach.":
+    ["sentence", ["and",
+      ["during", "light-sleet", "later-today-afternoon"],
+      ["during", "fog", "tomorrow-morning"]]],
+
+  "Gaoth làidir a' tòiseachadh madainn an-diugh, a' stad tràth feasgar an-diugh, agus flin madainn a-màireach.":
+    ["sentence", ["and",
+      ["starting-continuing-until",
+        "heavy-wind",
+        "today-morning",
+        "today-afternoon"],
+      ["during", "medium-sleet", "tomorrow-morning"]]],
+
+  "Sgothan truime a' tòiseachadh nas anmoiche a-nochd agus sneachda trom tràth feasgar a-màireach.":
+    ["sentence", ["and",
+      ["starting", "heavy-clouds", "later-today-night"],
+      ["during", "heavy-snow", "tomorrow-afternoon"]]],
+
+  "Tioram a-nochd agus sileadh aotrom a' tòiseachadh anmoch feasgar a-màireach, a' stad an ath oidhche.":
+    ["sentence", ["and",
+      ["during", "low-humidity", "today-night"],
+      ["starting-continuing-until",
+        "light-precipitation",
+        "tomorrow-evening",
+        "tomorrow-night"]]],
+
+  "Sneachd (5 òir.) a-nochd.":
+    ["sentence", ["during",
+      ["parenthetical", "medium-snow", ["inches", 5]],
+      "night"]],
+
+  "Sneachd aotrom (2 cm.) nas anmoiche madainn an-diugh.":
+    ["sentence", ["during",
+      ["parenthetical", "light-snow", ["centimeters", 2]],
+      "later-today-morning"]],
+
+  "Sneachda trom (8\u201312 òir.) fad an latha.":
+    ["sentence", ["for-day",
+      ["parenthetical", "heavy-snow", ["inches", ["range", 8, 12]]]]],
+
+  "Sneachd (< 1 cm.) tràth san fheasgar.":
+    ["sentence", ["during",
+      ["parenthetical", "medium-snow", ["less-than", ["centimeters", 1]]],
+      "afternoon"]],
+
+
+  "Gun sileadh fad na seachdain, le an teòthachd as àirde a' ruigsinn 85\u00B0F a-màireach.":
+    ["sentence", ["with",
+      ["for-week", "no-precipitation"],
+      ["temperatures-peaking",
+        ["fahrenheit", 85],
+        "tomorrow"]]],
+
+  "Sileadh measgaichte thairis air an deireadh-sheachdain, le an teòthachd as àirde a' ruigsinn 32\u00B0C Diardaoin.":
+    ["sentence", ["with",
+      ["over-weekend", "mixed-precipitation"],
+      ["temperatures-rising",
+        ["celsius", 32],
+        "thursday"]]],
+
+  "Uisge glè aotrom Diluain, le an teòthachd as àirde a' tuiteam gu 15\u00B0F Dihaoine.":
+    ["sentence", ["with",
+      ["during", "very-light-rain", "monday"],
+      ["temperatures-valleying",
+        ["fahrenheit", 15],
+        "friday"]]],
+
+  "Sneachd aotrom Dimàirt agus Diciadain an ath sheachdain, le an teòthachd as àirde a' tuiteam gu 0\u00B0C Didòmhnaich.":
+    ["sentence", ["with",
+      ["during", "light-snow", ["and", "tuesday", "next-wednesday"]],
+      ["temperatures-falling",
+        ["celsius", 0],
+        "sunday"]]],
+
+  "Sileadh an-diugh tro Disathairne, le an teòthachd as àirde a' ruigsinn 100\u00B0F Diluain.":
+    ["sentence", ["with",
+      ["during",
+        "medium-precipitation",
+        ["through", "today", "saturday"]],
+      ["temperatures-peaking",
+        ["fahrenheit", 100],
+        "monday"]]],
+
+  "Ma dh'fhaoidte gum bi stoirmean tàirneanaich Diciadain an ath sheachdain agus Diardaoin an ath sheachdain.":
+    ["sentence", ["during",
+      "possible-thunderstorm",
+        ["and", "next-wednesday", "next-thursday"]
+    ]],
+  "Chan eil ro-aithrisean an ath uair ri fhaoitinn airson grèis air sgàth 's gu bheil gu bheil a h-uile stèisean-radar a tha faisg air làimh far loidhne.":
+    ["sentence", ["next-hour-forecast-status", "temporarily-unavailable", "station-offline"]],
+
+  "Chan eil ro-aithrisean an ath uair ri fhaoitinn gu h-iomlan air sgàth 's gu bheil beàrnan anns an fhiosrachadh bho na stèisean-radar a tha faisg air làimh.":
+    ["sentence", ["next-hour-forecast-status", "partially-unavailable", "station-incomplete"]],
+
+  "Chan eil ro-aithrisean an ath uair ri fhaoitinn air sgàth 's gu bheil gu bheil a h-uile stèisean-radar a tha faisg air làimh far loidhne.":
+    ["sentence", ["next-hour-forecast-status", "unavailable", "station-offline"]]
+}

From 317abbea7e334258b6e0fec7c0339f251d8abd5d Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Sat, 18 Jan 2020 14:47:49 +0000
Subject: [PATCH 36/38] Add status properties in Scottish Gaelic

---
 lib/lang/gd.js | 403 ++++++++++++++++++-------------------------------
 1 file changed, 151 insertions(+), 252 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index c944f981..d946e035 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -1,252 +1,151 @@
-{
-  "Soilleir":
-    ["title", "clear"],
-
-  "Ma Dh'fhaoidte Gu Sil I Beagan":
-    ["title", "possible-very-light-precipitation"],
-
-  "Sileadh Glè Aotrom":
-    ["title", "very-light-precipitation"],
-
-  "Ma Dh'fhaoidte Gu Sil I":
-    ["title", "possible-light-precipitation"],
-
-  "Sileadh Aotrom":
-    ["title", "light-precipitation"],
-
-  "Sileadh":
-    ["title", "medium-precipitation"],
-
-  "Sileadh Trom":
-    ["title", "heavy-precipitation"],
-
-  "Ma Dh'fhaoidte Gum Bi Uisge Glè Aotrom":
-    ["title", "possible-very-light-rain"],
-
-  "Uisge Glè Aotrom":
-    ["title", "very-light-rain"],
-
-  "Ma Dh'fhaoidte Gum Bi Uisge Aotrom":
-    ["title", "possible-light-rain"],
-
-  "Uisge Aotrom":
-    ["title", "light-rain"],
-
-  "Uisge":
-    ["title", "medium-rain"],
-
-  "Uisge Trom":
-    ["title", "heavy-rain"],
-
-  "Ma Dh'fhaoidte Gum Bi Frasan Flin":
-    ["title", "possible-very-light-sleet"],
-
-  "Frasan Flin":
-    ["title", "very-light-sleet"],
-
-  "Ma Dh'fhaoidte Gum Bi Flin Aotrom":
-    ["title", "possible-light-sleet"],
-
-  "Flin Aotrom":
-    ["title", "light-sleet"],
-
-  "Flin":
-    ["title", "medium-sleet"],
-
-  "Flin Trom":
-    ["title", "heavy-sleet"],
-
-  "Ma Dh'fhaoidte Gum Bi Frasan Sneachda":
-    ["title", "possible-very-light-snow"],
-
-  "Frasan Sneachda":
-    ["title", "very-light-snow"],
-
-  "Ma Dh'fhaoidte Gun Cur I Sneachda":
-    ["title", "possible-light-snow"],
-
-  "Sneachd Aotrom":
-    ["title", "light-snow"],
-
-  "Sneachd":
-    ["title", "medium-snow"],
-
-  "Sneachda Trom":
-    ["title", "heavy-snow"],
-
-  "Gaoth":
-    ["title", "medium-wind"],
-
-  "Gaoth Làidir":
-    ["title", "heavy-wind"],
-
-  "Ceòthach":
-    ["title", "fog"],
-
-  "Sgothach":
-    ["title", "medium-clouds"],
-
-  "Sgothan Truime":
-    ["title", "heavy-clouds"],
-
-  "Tioram Agus Oiteag Shocair":
-    ["title", ["and", "low-humidity", "light-wind"]],
-
-  "Uisge Glè Aotrom Agus Gaoth Làidir":
-    ["title", ["and", "very-light-rain", "heavy-wind"]],
-
-  "Tais Agus Sgothan Aotruime":
-    ["title", ["and", "high-humidity", "light-clouds"]],
-
-  "Soilleir fad uair a thìde.":
-    ["sentence", ["for-hour", "clear"]],
-
-  "Frasan sneachda a' tòiseachadh ann an 35 mion.":
-    ["sentence", ["starting-in", "very-light-snow", ["minutes", 35]]],
-
-  "Uisge aotrom a' stad ann an 15 mion.":
-    ["sentence", ["stopping-in", "light-rain", ["minutes", 15]]],
-
-  "Flin trom a' tòiseachadh ann an 20 mion., a' stad as dèidh 30 mion.":
-    ["sentence",
-      ["starting-then-stopping-later",
-        "heavy-sleet",
-        ["minutes", 20],
-        ["minutes", 30]]],
-
-  "Uisge a' stad ann an 25 mion., a' tòiseachadh a-rithist as dèidh 8 mion.":
-    ["sentence",
-      ["stopping-then-starting-later",
-        "medium-rain",
-        ["minutes", 25],
-        ["minutes", 8]]],
-
-  "Sgothach fad an latha.":
-    ["sentence", ["for-day", "medium-clouds"]],
-
-  "Frasan flin a' tòiseachadh anns a' mhadainn.":
-    ["sentence", ["starting", "very-light-sleet", "morning"]],
-
-  "Gaoth a' stad a-nochd.":
-    ["sentence", ["until", "medium-wind", "today-night"]],
-
-  "Sileadh trom a' stad tràth san fheasgar.":
-    ["sentence", ["until", "heavy-precipitation", "afternoon"]],
-
-  "Oiteag shocair tràth san fheasgar.":
-    ["sentence", ["during", "light-wind", "afternoon"]],
-
-  "Sneachd nas anmoiche feasgar an-diugh agus madainn a-màireach.":
-    ["sentence", ["during",
-      "medium-snow",
-      ["and", "later-today-evening", "tomorrow-morning"]]],
-
-  "Uisge trom a' stad nas anmoiche madainn an-diugh, a' tòiseachadh a-rithist anmoch feasgar an-diugh.":
-    ["sentence", ["until-starting-again",
-      "heavy-rain",
-      "later-today-morning",
-      "today-evening"]],
-
-  "Sgothan truime a' tòiseachadh anmoch san fheasgar, a' stad a-nochd.":
-    ["sentence", ["starting-continuing-until",
-      "heavy-clouds",
-      "evening",
-      "night"]],
-
-  "Flin aotrom nas anmoiche feasgar an-diugh agus ceòthach madainn a-màireach.":
-    ["sentence", ["and",
-      ["during", "light-sleet", "later-today-afternoon"],
-      ["during", "fog", "tomorrow-morning"]]],
-
-  "Gaoth làidir a' tòiseachadh madainn an-diugh, a' stad tràth feasgar an-diugh, agus flin madainn a-màireach.":
-    ["sentence", ["and",
-      ["starting-continuing-until",
-        "heavy-wind",
-        "today-morning",
-        "today-afternoon"],
-      ["during", "medium-sleet", "tomorrow-morning"]]],
-
-  "Sgothan truime a' tòiseachadh nas anmoiche a-nochd agus sneachda trom tràth feasgar a-màireach.":
-    ["sentence", ["and",
-      ["starting", "heavy-clouds", "later-today-night"],
-      ["during", "heavy-snow", "tomorrow-afternoon"]]],
-
-  "Tioram a-nochd agus sileadh aotrom a' tòiseachadh anmoch feasgar a-màireach, a' stad an ath oidhche.":
-    ["sentence", ["and",
-      ["during", "low-humidity", "today-night"],
-      ["starting-continuing-until",
-        "light-precipitation",
-        "tomorrow-evening",
-        "tomorrow-night"]]],
-
-  "Sneachd (5 òir.) a-nochd.":
-    ["sentence", ["during",
-      ["parenthetical", "medium-snow", ["inches", 5]],
-      "night"]],
-
-  "Sneachd aotrom (2 cm.) nas anmoiche madainn an-diugh.":
-    ["sentence", ["during",
-      ["parenthetical", "light-snow", ["centimeters", 2]],
-      "later-today-morning"]],
-
-  "Sneachda trom (8\u201312 òir.) fad an latha.":
-    ["sentence", ["for-day",
-      ["parenthetical", "heavy-snow", ["inches", ["range", 8, 12]]]]],
-
-  "Sneachd (< 1 cm.) tràth san fheasgar.":
-    ["sentence", ["during",
-      ["parenthetical", "medium-snow", ["less-than", ["centimeters", 1]]],
-      "afternoon"]],
-
-
-  "Gun sileadh fad na seachdain, le an teòthachd as àirde a' ruigsinn 85\u00B0F a-màireach.":
-    ["sentence", ["with",
-      ["for-week", "no-precipitation"],
-      ["temperatures-peaking",
-        ["fahrenheit", 85],
-        "tomorrow"]]],
-
-  "Sileadh measgaichte thairis air an deireadh-sheachdain, le an teòthachd as àirde a' ruigsinn 32\u00B0C Diardaoin.":
-    ["sentence", ["with",
-      ["over-weekend", "mixed-precipitation"],
-      ["temperatures-rising",
-        ["celsius", 32],
-        "thursday"]]],
-
-  "Uisge glè aotrom Diluain, le an teòthachd as àirde a' tuiteam gu 15\u00B0F Dihaoine.":
-    ["sentence", ["with",
-      ["during", "very-light-rain", "monday"],
-      ["temperatures-valleying",
-        ["fahrenheit", 15],
-        "friday"]]],
-
-  "Sneachd aotrom Dimàirt agus Diciadain an ath sheachdain, le an teòthachd as àirde a' tuiteam gu 0\u00B0C Didòmhnaich.":
-    ["sentence", ["with",
-      ["during", "light-snow", ["and", "tuesday", "next-wednesday"]],
-      ["temperatures-falling",
-        ["celsius", 0],
-        "sunday"]]],
-
-  "Sileadh an-diugh tro Disathairne, le an teòthachd as àirde a' ruigsinn 100\u00B0F Diluain.":
-    ["sentence", ["with",
-      ["during",
-        "medium-precipitation",
-        ["through", "today", "saturday"]],
-      ["temperatures-peaking",
-        ["fahrenheit", 100],
-        "monday"]]],
-
-  "Ma dh'fhaoidte gum bi stoirmean tàirneanaich Diciadain an ath sheachdain agus Diardaoin an ath sheachdain.":
-    ["sentence", ["during",
-      "possible-thunderstorm",
-        ["and", "next-wednesday", "next-thursday"]
-    ]],
-  "Chan eil ro-aithrisean an ath uair ri fhaoitinn airson grèis air sgàth 's gu bheil gu bheil a h-uile stèisean-radar a tha faisg air làimh far loidhne.":
-    ["sentence", ["next-hour-forecast-status", "temporarily-unavailable", "station-offline"]],
-
-  "Chan eil ro-aithrisean an ath uair ri fhaoitinn gu h-iomlan air sgàth 's gu bheil beàrnan anns an fhiosrachadh bho na stèisean-radar a tha faisg air làimh.":
-    ["sentence", ["next-hour-forecast-status", "partially-unavailable", "station-incomplete"]],
-
-  "Chan eil ro-aithrisean an ath uair ri fhaoitinn air sgàth 's gu bheil gu bheil a h-uile stèisean-radar a tha faisg air làimh far loidhne.":
-    ["sentence", ["next-hour-forecast-status", "unavailable", "station-offline"]]
-}
+  "use strict";
+
+  function join_with_shared_prefix(a, b, joiner) {
+    let i = 0;
+
+    while(i !== a.length &&
+          i !== b.length &&
+          a.charCodeAt(i) === b.charCodeAt(i))
+      ++i;
+
+    while(i && a.charCodeAt(i - 1) !== 32)
+      --i;
+
+    return a + joiner + b.slice(i);
+  }
+
+  module.exports = {
+    "clear": "soilleir",
+    "no-precipitation": "gun sileadh",
+    "mixed-precipitation": "sileadh measgaichte",
+    "possible-very-light-precipitation": "ma dh'fhaoidte gu sil i beagan",
+    "very-light-precipitation": "sileadh glè aotrom",
+    "possible-light-precipitation": "ma dh'fhaoidte gu sil i",
+    "light-precipitation": "sileadh aotrom",
+    "medium-precipitation": "sileadh",
+    "heavy-precipitation": "sileadh trom",
+    "possible-very-light-rain": "ma dh'fhaoidte gum bi uisge glè aotrom",
+    "very-light-rain": "uisge glè aotrom",
+    "possible-light-rain": "ma dh'fhaoidte gum bi uisge aotrom",
+    "light-rain": "uisge aotrom",
+    "medium-rain": "uisge",
+    "heavy-rain": "uisge trom",
+    "possible-very-light-sleet": "ma dh'fhaoidte gum bi frasan flin",
+    "very-light-sleet": "frasan flin",
+    "possible-light-sleet": "ma dh'fhaoidte gum bi flin aotrom",
+    "light-sleet": "flin aotrom",
+    "medium-sleet": "flin",
+    "heavy-sleet": "flin trom",
+    "possible-very-light-snow": "ma dh'fhaoidte gum bi frasan sneachda",
+    "very-light-snow": "frasan sneachda",
+    "possible-light-snow": "ma dh'fhaoidte gun cur i sneachda",
+    "light-snow": "sneachd aotrom",
+    "medium-snow": "sneachd",
+    "heavy-snow": "sneachda trom",
+    "possible-thunderstorm": "ma dh'fhaoidte gum bi stoirmean tàirneanaich",
+    "thunderstorm": "stoirmean tàirneanaich",
+    "light-wind": "oiteag shocair",
+    "medium-wind": "gaoth",
+    "heavy-wind": "gaoth làidir",
+    "low-humidity": "tioram",
+    "high-humidity": "tais",
+    "fog": "ceòthach",
+    "light-clouds": "sgothan aotruime",
+    "medium-clouds": "sgothach",
+    "heavy-clouds": "sgothan truime",
+    "today-morning": "madainn an-diugh",
+    "later-today-morning": "nas anmoiche madainn an-diugh",
+    "today-afternoon": "tràth feasgar an-diugh",
+    "later-today-afternoon": "nas anmoiche feasgar an-diugh",
+    "today-evening": "anmoch feasgar an-diugh",
+    "later-today-evening": "nas anmoiche feasgar an-diugh",
+    "today-night": "a-nochd",
+    "later-today-night": "nas anmoiche a-nochd",
+    "tomorrow-morning": "madainn a-màireach",
+    "tomorrow-afternoon": "tràth feasgar a-màireach",
+    "tomorrow-evening": "anmoch feasgar a-màireach",
+    "tomorrow-night": "an ath oidhche",
+    "morning": "anns a' mhadainn",
+    "afternoon": "tràth san fheasgar",
+    "evening": "anmoch san fheasgar",
+    "night": "a-nochd",
+    "today": "an-diugh",
+    "tomorrow": "a-màireach",
+    "sunday": "Didòmhnaich",
+    "monday": "Diluain",
+    "tuesday": "Dimàirt",
+    "wednesday": "Diciadain",
+    "thursday": "Diardaoin",
+    "friday": "Dihaoine",
+    "saturday": "Disathairne",
+    "next-sunday": "Didòmhnaich an ath sheachdain",
+    "next-monday": "Diluain an ath sheachdain",
+    "next-tuesday": "Dimàirt an ath sheachdain",
+    "next-wednesday": "Diciadain an ath sheachdain",
+    "next-thursday": "Diardaoin an ath sheachdain",
+    "next-friday": "Dihaoine an ath sheachdain",
+    "next-saturday": "Disathairne an ath sheachdain",
+    "minutes": "$1 mion.",
+    "fahrenheit": "$1\u00B0F",
+    "celsius": "$1\u00B0C",
+    "inches": "$1 òir.",
+    "centimeters": "$1 cm.",
+    "less-than": "< $1",
+    "and": function(a, b) {
+      return join_with_shared_prefix(
+        a,
+        b,
+        a.indexOf(",") !== -1 ? ", agus " : " agus "
+      );
+    },
+    "through": function(a, b) {
+      return join_with_shared_prefix(a, b, " tro ");
+    },
+    "with": "$1, le $2",
+    "range": "$1\u2013$2",
+    "parenthetical": "$1 ($2)",
+    "for-hour": "$1 fad uair a thìde",
+    "starting-in": "$1 a' tòiseachadh ann an $2",
+    "stopping-in": "$1 a' stad ann an $2",
+    "starting-then-stopping-later": "$1 a' tòiseachadh ann an $2, a' stad as dèidh $3",
+    "stopping-then-starting-later": "$1 a' stad ann an $2, a' tòiseachadh a-rithist as dèidh $3",
+    "for-day": "$1 fad an latha",
+    "starting": "$1 a' tòiseachadh $2",
+    "until": "$1 a' stad $2",
+    "until-starting-again": "$1 a' stad $2, a' tòiseachadh a-rithist $3",
+    "starting-continuing-until": "$1 a' tòiseachadh $2, a' stad $3",
+    "during": "$1 $2",
+    "for-week": "$1 fad na seachdain",
+    "over-weekend": "$1 thairis air an deireadh-sheachdain",
+    "temperatures-peaking": "an teòthachd as àirde a' ruigsinn $1 $2",
+    "temperatures-rising": "an teòthachd as àirde a' ruigsinn $1 $2",
+    "temperatures-valleying": "an teòthachd as àirde a' tuiteam gu $1 $2",
+    "temperatures-falling": "an teòthachd as àirde a' tuiteam gu $1 $2",
+    // Capitalize the first letter of every word, except if that word is
+    // "and". (This is a very crude bastardization of proper English titling
+    // rules, but it is adequate for the purposes of this module.)
+    "title": function(str) {
+      return str.replace(/\S+/g, function(word) {
+        return word === "Agus" ?
+          word :
+          word.charAt(0).toUpperCase() + word.slice(1);
+      });
+    },
+    /* Capitalize the first word of the sentence and end with a period. */
+    "sentence": function(str) {
+      /* Capitalize. */
+      str = str.charAt(0).toUpperCase() + str.slice(1);
+
+      /* Add a period if there isn't already one. */
+      if(str.charAt(str.length - 1) !== ".")
+        str += ".";
+
+      return str;
+    },
+    "next-hour-forecast-status": "chan eil ro-aithrisean an ath uair $1 air sgàth 's gu bheil $2",
+    "unavailable": "ri fhaoitinn",
+    "temporarily-unavailable": "ri fhaoitinn airson grèis",
+    "partially-unavailable": "ri fhaoitinn gu h-iomlan",
+    "station-offline": "gu bheil a h-uile stèisean-radar a tha faisg air làimh far loidhne",
+    "station-incomplete": "beàrnan anns an fhiosrachadh bho na stèisean-radar a tha faisg air làimh",
+  };

From 960ec1426a3b7d796b2b4ed80037a9651bf59817 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Sat, 18 Jan 2020 14:48:18 +0000
Subject: [PATCH 37/38] Add status properties in Scottish Gaelic

---
 test_cases/gd.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test_cases/gd.json b/test_cases/gd.json
index 6b5c3735..c944f981 100644
--- a/test_cases/gd.json
+++ b/test_cases/gd.json
@@ -247,6 +247,6 @@
   "Chan eil ro-aithrisean an ath uair ri fhaoitinn gu h-iomlan air sgàth 's gu bheil beàrnan anns an fhiosrachadh bho na stèisean-radar a tha faisg air làimh.":
     ["sentence", ["next-hour-forecast-status", "partially-unavailable", "station-incomplete"]],
 
-  "Chan eil ro-aithrisean an ath uair ri fhaoitinn air sgàth 's gu bheil gu bheil a h-uile stèisean-radar a tha faisg air làimh far loidhne":
+  "Chan eil ro-aithrisean an ath uair ri fhaoitinn air sgàth 's gu bheil gu bheil a h-uile stèisean-radar a tha faisg air làimh far loidhne.":
     ["sentence", ["next-hour-forecast-status", "unavailable", "station-offline"]]
 }

From 1400d9528e0aa0266b85e53a10be7eca3b4081c0 Mon Sep 17 00:00:00 2001
From: Chris Mitchell <MacMhicheil@users.noreply.github.com>
Date: Sat, 18 Jan 2020 14:52:46 +0000
Subject: [PATCH 38/38] Corrected spacing

---
 lib/lang/gd.js | 288 ++++++++++++++++++++++++-------------------------
 1 file changed, 144 insertions(+), 144 deletions(-)

diff --git a/lib/lang/gd.js b/lib/lang/gd.js
index d946e035..5508ab4d 100644
--- a/lib/lang/gd.js
+++ b/lib/lang/gd.js
@@ -1,151 +1,151 @@
-  "use strict";
+"use strict";
 
-  function join_with_shared_prefix(a, b, joiner) {
-    let i = 0;
+function join_with_shared_prefix(a, b, joiner) {
+  let i = 0;
 
-    while(i !== a.length &&
-          i !== b.length &&
-          a.charCodeAt(i) === b.charCodeAt(i))
-      ++i;
+  while(i !== a.length &&
+        i !== b.length &&
+        a.charCodeAt(i) === b.charCodeAt(i))
+    ++i;
 
-    while(i && a.charCodeAt(i - 1) !== 32)
-      --i;
+  while(i && a.charCodeAt(i - 1) !== 32)
+    --i;
 
-    return a + joiner + b.slice(i);
-  }
+  return a + joiner + b.slice(i);
+}
 
-  module.exports = {
-    "clear": "soilleir",
-    "no-precipitation": "gun sileadh",
-    "mixed-precipitation": "sileadh measgaichte",
-    "possible-very-light-precipitation": "ma dh'fhaoidte gu sil i beagan",
-    "very-light-precipitation": "sileadh glè aotrom",
-    "possible-light-precipitation": "ma dh'fhaoidte gu sil i",
-    "light-precipitation": "sileadh aotrom",
-    "medium-precipitation": "sileadh",
-    "heavy-precipitation": "sileadh trom",
-    "possible-very-light-rain": "ma dh'fhaoidte gum bi uisge glè aotrom",
-    "very-light-rain": "uisge glè aotrom",
-    "possible-light-rain": "ma dh'fhaoidte gum bi uisge aotrom",
-    "light-rain": "uisge aotrom",
-    "medium-rain": "uisge",
-    "heavy-rain": "uisge trom",
-    "possible-very-light-sleet": "ma dh'fhaoidte gum bi frasan flin",
-    "very-light-sleet": "frasan flin",
-    "possible-light-sleet": "ma dh'fhaoidte gum bi flin aotrom",
-    "light-sleet": "flin aotrom",
-    "medium-sleet": "flin",
-    "heavy-sleet": "flin trom",
-    "possible-very-light-snow": "ma dh'fhaoidte gum bi frasan sneachda",
-    "very-light-snow": "frasan sneachda",
-    "possible-light-snow": "ma dh'fhaoidte gun cur i sneachda",
-    "light-snow": "sneachd aotrom",
-    "medium-snow": "sneachd",
-    "heavy-snow": "sneachda trom",
-    "possible-thunderstorm": "ma dh'fhaoidte gum bi stoirmean tàirneanaich",
-    "thunderstorm": "stoirmean tàirneanaich",
-    "light-wind": "oiteag shocair",
-    "medium-wind": "gaoth",
-    "heavy-wind": "gaoth làidir",
-    "low-humidity": "tioram",
-    "high-humidity": "tais",
-    "fog": "ceòthach",
-    "light-clouds": "sgothan aotruime",
-    "medium-clouds": "sgothach",
-    "heavy-clouds": "sgothan truime",
-    "today-morning": "madainn an-diugh",
-    "later-today-morning": "nas anmoiche madainn an-diugh",
-    "today-afternoon": "tràth feasgar an-diugh",
-    "later-today-afternoon": "nas anmoiche feasgar an-diugh",
-    "today-evening": "anmoch feasgar an-diugh",
-    "later-today-evening": "nas anmoiche feasgar an-diugh",
-    "today-night": "a-nochd",
-    "later-today-night": "nas anmoiche a-nochd",
-    "tomorrow-morning": "madainn a-màireach",
-    "tomorrow-afternoon": "tràth feasgar a-màireach",
-    "tomorrow-evening": "anmoch feasgar a-màireach",
-    "tomorrow-night": "an ath oidhche",
-    "morning": "anns a' mhadainn",
-    "afternoon": "tràth san fheasgar",
-    "evening": "anmoch san fheasgar",
-    "night": "a-nochd",
-    "today": "an-diugh",
-    "tomorrow": "a-màireach",
-    "sunday": "Didòmhnaich",
-    "monday": "Diluain",
-    "tuesday": "Dimàirt",
-    "wednesday": "Diciadain",
-    "thursday": "Diardaoin",
-    "friday": "Dihaoine",
-    "saturday": "Disathairne",
-    "next-sunday": "Didòmhnaich an ath sheachdain",
-    "next-monday": "Diluain an ath sheachdain",
-    "next-tuesday": "Dimàirt an ath sheachdain",
-    "next-wednesday": "Diciadain an ath sheachdain",
-    "next-thursday": "Diardaoin an ath sheachdain",
-    "next-friday": "Dihaoine an ath sheachdain",
-    "next-saturday": "Disathairne an ath sheachdain",
-    "minutes": "$1 mion.",
-    "fahrenheit": "$1\u00B0F",
-    "celsius": "$1\u00B0C",
-    "inches": "$1 òir.",
-    "centimeters": "$1 cm.",
-    "less-than": "< $1",
-    "and": function(a, b) {
-      return join_with_shared_prefix(
-        a,
-        b,
-        a.indexOf(",") !== -1 ? ", agus " : " agus "
-      );
-    },
-    "through": function(a, b) {
-      return join_with_shared_prefix(a, b, " tro ");
-    },
-    "with": "$1, le $2",
-    "range": "$1\u2013$2",
-    "parenthetical": "$1 ($2)",
-    "for-hour": "$1 fad uair a thìde",
-    "starting-in": "$1 a' tòiseachadh ann an $2",
-    "stopping-in": "$1 a' stad ann an $2",
-    "starting-then-stopping-later": "$1 a' tòiseachadh ann an $2, a' stad as dèidh $3",
-    "stopping-then-starting-later": "$1 a' stad ann an $2, a' tòiseachadh a-rithist as dèidh $3",
-    "for-day": "$1 fad an latha",
-    "starting": "$1 a' tòiseachadh $2",
-    "until": "$1 a' stad $2",
-    "until-starting-again": "$1 a' stad $2, a' tòiseachadh a-rithist $3",
-    "starting-continuing-until": "$1 a' tòiseachadh $2, a' stad $3",
-    "during": "$1 $2",
-    "for-week": "$1 fad na seachdain",
-    "over-weekend": "$1 thairis air an deireadh-sheachdain",
-    "temperatures-peaking": "an teòthachd as àirde a' ruigsinn $1 $2",
-    "temperatures-rising": "an teòthachd as àirde a' ruigsinn $1 $2",
-    "temperatures-valleying": "an teòthachd as àirde a' tuiteam gu $1 $2",
-    "temperatures-falling": "an teòthachd as àirde a' tuiteam gu $1 $2",
-    // Capitalize the first letter of every word, except if that word is
-    // "and". (This is a very crude bastardization of proper English titling
-    // rules, but it is adequate for the purposes of this module.)
-    "title": function(str) {
-      return str.replace(/\S+/g, function(word) {
-        return word === "Agus" ?
-          word :
-          word.charAt(0).toUpperCase() + word.slice(1);
-      });
-    },
-    /* Capitalize the first word of the sentence and end with a period. */
-    "sentence": function(str) {
-      /* Capitalize. */
-      str = str.charAt(0).toUpperCase() + str.slice(1);
+module.exports = {
+  "clear": "soilleir",
+  "no-precipitation": "gun sileadh",
+  "mixed-precipitation": "sileadh measgaichte",
+  "possible-very-light-precipitation": "ma dh'fhaoidte gu sil i beagan",
+  "very-light-precipitation": "sileadh glè aotrom",
+  "possible-light-precipitation": "ma dh'fhaoidte gu sil i",
+  "light-precipitation": "sileadh aotrom",
+  "medium-precipitation": "sileadh",
+  "heavy-precipitation": "sileadh trom",
+  "possible-very-light-rain": "ma dh'fhaoidte gum bi uisge glè aotrom",
+  "very-light-rain": "uisge glè aotrom",
+  "possible-light-rain": "ma dh'fhaoidte gum bi uisge aotrom",
+  "light-rain": "uisge aotrom",
+  "medium-rain": "uisge",
+  "heavy-rain": "uisge trom",
+  "possible-very-light-sleet": "ma dh'fhaoidte gum bi frasan flin",
+  "very-light-sleet": "frasan flin",
+  "possible-light-sleet": "ma dh'fhaoidte gum bi flin aotrom",
+  "light-sleet": "flin aotrom",
+  "medium-sleet": "flin",
+  "heavy-sleet": "flin trom",
+  "possible-very-light-snow": "ma dh'fhaoidte gum bi frasan sneachda",
+  "very-light-snow": "frasan sneachda",
+  "possible-light-snow": "ma dh'fhaoidte gun cur i sneachda",
+  "light-snow": "sneachd aotrom",
+  "medium-snow": "sneachd",
+  "heavy-snow": "sneachda trom",
+  "possible-thunderstorm": "ma dh'fhaoidte gum bi stoirmean tàirneanaich",
+  "thunderstorm": "stoirmean tàirneanaich",
+  "light-wind": "oiteag shocair",
+  "medium-wind": "gaoth",
+  "heavy-wind": "gaoth làidir",
+  "low-humidity": "tioram",
+  "high-humidity": "tais",
+  "fog": "ceòthach",
+  "light-clouds": "sgothan aotruime",
+  "medium-clouds": "sgothach",
+  "heavy-clouds": "sgothan truime",
+  "today-morning": "madainn an-diugh",
+  "later-today-morning": "nas anmoiche madainn an-diugh",
+  "today-afternoon": "tràth feasgar an-diugh",
+  "later-today-afternoon": "nas anmoiche feasgar an-diugh",
+  "today-evening": "anmoch feasgar an-diugh",
+  "later-today-evening": "nas anmoiche feasgar an-diugh",
+  "today-night": "a-nochd",
+  "later-today-night": "nas anmoiche a-nochd",
+  "tomorrow-morning": "madainn a-màireach",
+  "tomorrow-afternoon": "tràth feasgar a-màireach",
+  "tomorrow-evening": "anmoch feasgar a-màireach",
+  "tomorrow-night": "an ath oidhche",
+  "morning": "anns a' mhadainn",
+  "afternoon": "tràth san fheasgar",
+  "evening": "anmoch san fheasgar",
+  "night": "a-nochd",
+  "today": "an-diugh",
+  "tomorrow": "a-màireach",
+  "sunday": "Didòmhnaich",
+  "monday": "Diluain",
+  "tuesday": "Dimàirt",
+  "wednesday": "Diciadain",
+  "thursday": "Diardaoin",
+  "friday": "Dihaoine",
+  "saturday": "Disathairne",
+  "next-sunday": "Didòmhnaich an ath sheachdain",
+  "next-monday": "Diluain an ath sheachdain",
+  "next-tuesday": "Dimàirt an ath sheachdain",
+  "next-wednesday": "Diciadain an ath sheachdain",
+  "next-thursday": "Diardaoin an ath sheachdain",
+  "next-friday": "Dihaoine an ath sheachdain",
+  "next-saturday": "Disathairne an ath sheachdain",
+  "minutes": "$1 mion.",
+  "fahrenheit": "$1\u00B0F",
+  "celsius": "$1\u00B0C",
+  "inches": "$1 òir.",
+  "centimeters": "$1 cm.",
+  "less-than": "< $1",
+  "and": function(a, b) {
+    return join_with_shared_prefix(
+      a,
+      b,
+      a.indexOf(",") !== -1 ? ", agus " : " agus "
+    );
+  },
+  "through": function(a, b) {
+    return join_with_shared_prefix(a, b, " tro ");
+  },
+  "with": "$1, le $2",
+  "range": "$1\u2013$2",
+  "parenthetical": "$1 ($2)",
+  "for-hour": "$1 fad uair a thìde",
+  "starting-in": "$1 a' tòiseachadh ann an $2",
+  "stopping-in": "$1 a' stad ann an $2",
+  "starting-then-stopping-later": "$1 a' tòiseachadh ann an $2, a' stad as dèidh $3",
+  "stopping-then-starting-later": "$1 a' stad ann an $2, a' tòiseachadh a-rithist as dèidh $3",
+  "for-day": "$1 fad an latha",
+  "starting": "$1 a' tòiseachadh $2",
+  "until": "$1 a' stad $2",
+  "until-starting-again": "$1 a' stad $2, a' tòiseachadh a-rithist $3",
+  "starting-continuing-until": "$1 a' tòiseachadh $2, a' stad $3",
+  "during": "$1 $2",
+  "for-week": "$1 fad na seachdain",
+  "over-weekend": "$1 thairis air an deireadh-sheachdain",
+  "temperatures-peaking": "an teòthachd as àirde a' ruigsinn $1 $2",
+  "temperatures-rising": "an teòthachd as àirde a' ruigsinn $1 $2",
+  "temperatures-valleying": "an teòthachd as àirde a' tuiteam gu $1 $2",
+  "temperatures-falling": "an teòthachd as àirde a' tuiteam gu $1 $2",
+  // Capitalize the first letter of every word, except if that word is
+  // "and". (This is a very crude bastardization of proper English titling
+  // rules, but it is adequate for the purposes of this module.)
+  "title": function(str) {
+    return str.replace(/\S+/g, function(word) {
+      return word === "Agus" ?
+        word :
+        word.charAt(0).toUpperCase() + word.slice(1);
+    });
+  },
+  /* Capitalize the first word of the sentence and end with a period. */
+  "sentence": function(str) {
+    /* Capitalize. */
+    str = str.charAt(0).toUpperCase() + str.slice(1);
 
-      /* Add a period if there isn't already one. */
-      if(str.charAt(str.length - 1) !== ".")
-        str += ".";
+    /* Add a period if there isn't already one. */
+    if(str.charAt(str.length - 1) !== ".")
+      str += ".";
 
-      return str;
-    },
-    "next-hour-forecast-status": "chan eil ro-aithrisean an ath uair $1 air sgàth 's gu bheil $2",
-    "unavailable": "ri fhaoitinn",
-    "temporarily-unavailable": "ri fhaoitinn airson grèis",
-    "partially-unavailable": "ri fhaoitinn gu h-iomlan",
-    "station-offline": "gu bheil a h-uile stèisean-radar a tha faisg air làimh far loidhne",
-    "station-incomplete": "beàrnan anns an fhiosrachadh bho na stèisean-radar a tha faisg air làimh",
-  };
+    return str;
+  },
+  "next-hour-forecast-status": "chan eil ro-aithrisean an ath uair $1 air sgàth 's gu bheil $2",
+  "unavailable": "ri fhaoitinn",
+  "temporarily-unavailable": "ri fhaoitinn airson grèis",
+  "partially-unavailable": "ri fhaoitinn gu h-iomlan",
+  "station-offline": "gu bheil a h-uile stèisean-radar a tha faisg air làimh far loidhne",
+  "station-incomplete": "beàrnan anns an fhiosrachadh bho na stèisean-radar a tha faisg air làimh",
+};