4 files changed, 16 insertions, 2 deletions

diff --git a/client/angular.json b/client/angular.json
index 6c0289041..9bf02e271 100644
--- a/client/angular.json
+++ b/client/angular.json
@@ -93,6 +93,10 @@
             "translation": "src/locale/angular.ca-ES.xlf",
             "baseHref": "/client/ca-ES/"
           },
+          "gl": {
+            "translation": "src/locale/angular.gl-ES.xlf",
+            "baseHref": "/client/gl-ES/"
+          },
           "cs": {
             "translation": "src/locale/angular.cs-CZ.xlf",
             "baseHref": "/client/cs-CZ/"
@@ -307,6 +311,7 @@
               "languages": [
                 "ar",
                 "ca-ES",
+                "gl-ES",
                 "cs-CZ",
                 "da-DK",
                 "de-DE",
diff --git a/scripts/build/client.sh b/scripts/build/client.sh
index 3bca9105a..0f5b2d976 100755
--- a/scripts/build/client.sh
+++ b/scripts/build/client.sh
@@ -29,6 +29,7 @@ languages=(
     ["ja"]="ja-JP"
     ["eu"]="eu-ES"
     ["ca"]="ca-ES"
+    ["gl"]="gl-ES"
     ["cs"]="cs-CZ"
     ["eo"]="eo"
     ["de"]="de-DE"
diff --git a/server/tests/api/server/stats.ts b/server/tests/api/server/stats.ts
index 9f785a80e..b752da743 100644
--- a/server/tests/api/server/stats.ts
+++ b/server/tests/api/server/stats.ts
@@ -135,7 +135,7 @@ describe('Test stats (excluding redundancy)', function () {
   })
 
   it('Should correctly count video file sizes if transcoding is enabled', async function () {
-    this.timeout(20000)
+    this.timeout(60000)
 
     await updateCustomSubConfig(servers[0].url, servers[0].accessToken, {
       transcoding: {
@@ -179,6 +179,12 @@ describe('Test stats (excluding redundancy)', function () {
   it('Should have the correct AP stats', async function () {
     this.timeout(60000)
 
+    await updateCustomSubConfig(servers[0].url, servers[0].accessToken, {
+      transcoding: {
+        enabled: false
+      }
+    })
+
     for (let i = 0; i < 10; i++) {
       await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'video' })
     }
@@ -191,7 +197,6 @@ describe('Test stats (excluding redundancy)', function () {
     const res2 = await getStats(servers[1].url)
     const second: ServerStats = res2.body
 
-    expect(second.totalActivityPubMessagesWaiting).to.equal(0)
     expect(second.totalActivityPubMessagesProcessed).to.be.greaterThan(first.totalActivityPubMessagesProcessed)
 
     await wait(5000)
@@ -199,6 +204,7 @@ describe('Test stats (excluding redundancy)', function () {
     const res3 = await getStats(servers[1].url)
     const third: ServerStats = res3.body
 
+    expect(third.totalActivityPubMessagesWaiting).to.equal(0)
     expect(third.activityPubMessagesProcessedPerSecond).to.be.lessThan(second.activityPubMessagesProcessedPerSecond)
   })
 
diff --git a/shared/core-utils/i18n/i18n.ts b/shared/core-utils/i18n/i18n.ts
index 9ad0f456d..cc7621da8 100644
--- a/shared/core-utils/i18n/i18n.ts
+++ b/shared/core-utils/i18n/i18n.ts
@@ -15,6 +15,7 @@ export const I18N_LOCALES = {
   'fi-FI': 'suomi',
   'fr-FR': 'Français',
   'gd': 'Gàidhlig',
+  'gl-ES': 'galego',
   'hu-HU': 'magyar',
   'it-IT': 'Italiano',
   'ja-JP': '日本語',
@@ -42,6 +43,7 @@ const I18N_LOCALE_ALIAS = {
   'es': 'es-ES',
   'eu': 'eu-ES',
   'fi': 'fi-FI',
+  'gl': 'gl-ES',
   'fr': 'fr-FR',
   'hu': 'hu-HU',
   'it': 'it-IT',