diff --git a/package-lock.json b/package-lock.json
index c82f414d0..3745a19f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -58,7 +58,7 @@
 				"lerna": "^4.0.0",
 				"mini-css-extract-plugin": "^2.6.0",
 				"minimist": "^1.2.6",
-				"po-loader": "^0.5.0",
+				"po-loader": "conversejs/po-loader#ae72d170bdd0e4066fd8c2af56e1170c59999340",
 				"postcss": "^8.4.12",
 				"postcss-clean": "1.2.0",
 				"postcss-loader": "^6.2.1",
@@ -8363,13 +8363,38 @@
 			}
 		},
 		"node_modules/gettext-parser": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-1.1.0.tgz",
-			"integrity": "sha1-LFpmONiTk0ubVQN9CtgstwBLJnk=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-2.0.0.tgz",
+			"integrity": "sha512-FDs/7XjNw58ToQwJFO7avZZbPecSYgw8PBYhd0An+4JtZSrSzKhEvTsVV2uqdO7VziWTOGSgLGD5YRPdsCjF7Q==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"encoding": "^0.1.11"
+				"encoding": "^0.1.12",
+				"safe-buffer": "^5.1.2"
+			}
+		},
+		"node_modules/gettext-to-messageformat": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/gettext-to-messageformat/-/gettext-to-messageformat-0.3.1.tgz",
+			"integrity": "sha512-UyqIL3Ul4NryU95Wome/qtlcuVIqgEWVIFw0zi7Lv14ACLXfaVDCbrjZ7o+3BZ7u+4NS1mP/2O1eXZoHCoas8g==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"gettext-parser": "^1.4.0"
+			},
+			"engines": {
+				"node": ">=6.0"
+			}
+		},
+		"node_modules/gettext-to-messageformat/node_modules/gettext-parser": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-1.4.0.tgz",
+			"integrity": "sha512-sedZYLHlHeBop/gZ1jdg59hlUEcpcZJofLq2JFwJT1zTqAU3l2wFv6IsuwFHGqbiT9DWzMUW4/em2+hspnmMMA==",
+			"dev": true,
+			"peer": true,
+			"dependencies": {
+				"encoding": "^0.1.12",
+				"safe-buffer": "^5.1.1"
 			}
 		},
 		"node_modules/git-raw-commits": {
@@ -8627,16 +8652,6 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/has-color": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz",
-			"integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/has-flag": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -11659,63 +11674,6 @@
 			"integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
 			"dev": true
 		},
-		"node_modules/nomnom": {
-			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
-			"integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=",
-			"deprecated": "Package no longer supported. Contact support@npmjs.com for more info.",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"chalk": "~0.4.0",
-				"underscore": "~1.6.0"
-			}
-		},
-		"node_modules/nomnom/node_modules/ansi-styles": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
-			"integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=",
-			"dev": true,
-			"peer": true,
-			"engines": {
-				"node": ">=0.8.0"
-			}
-		},
-		"node_modules/nomnom/node_modules/chalk": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
-			"integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"ansi-styles": "~1.0.0",
-				"has-color": "~0.1.0",
-				"strip-ansi": "~0.1.0"
-			},
-			"engines": {
-				"node": ">=0.8.0"
-			}
-		},
-		"node_modules/nomnom/node_modules/strip-ansi": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
-			"integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=",
-			"dev": true,
-			"peer": true,
-			"bin": {
-				"strip-ansi": "cli.js"
-			},
-			"engines": {
-				"node": ">=0.8.0"
-			}
-		},
-		"node_modules/nomnom/node_modules/underscore": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-			"integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
-			"dev": true,
-			"peer": true
-		},
 		"node_modules/nopt": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
@@ -12697,31 +12655,47 @@
 		},
 		"node_modules/po-loader": {
 			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/po-loader/-/po-loader-0.5.0.tgz",
-			"integrity": "sha512-2VyoECqHL6pLUxQqszi9WskwOgRPtO3y+fhVmYMb46L+5S03whRf/lHqWhbTE3AbwEc6DdPuGKFD4IUbWuM/YQ==",
+			"resolved": "git+ssh://git@github.com/conversejs/po-loader.git#ae72d170bdd0e4066fd8c2af56e1170c59999340",
+			"integrity": "sha512-5v5k7OFHMe/jjuC1rCaaeV5F0mPTPIcOcjlFieWaWkzDMjrU8LXRubth8shYReTJBkn05yNvYkTy51TvtcQ8fw==",
 			"dev": true,
 			"dependencies": {
 				"loader-utils": "^1.2.3"
 			},
 			"peerDependencies": {
-				"po2json": ">=0.4.5"
+				"po2json": ">=1.0.0-beta-3"
 			}
 		},
 		"node_modules/po2json": {
-			"version": "0.4.5",
-			"resolved": "https://registry.npmjs.org/po2json/-/po2json-0.4.5.tgz",
-			"integrity": "sha1-R7spUtoy1Yob4vJWpZjuvAt0URg=",
+			"version": "1.0.0-beta-3",
+			"resolved": "https://registry.npmjs.org/po2json/-/po2json-1.0.0-beta-3.tgz",
+			"integrity": "sha512-taS8y6ZEGzPAs0rygW9CuUPY8C3Zgx6cBy31QXxG2JlWS3fLxj/kuD3cbIfXBg30PuYN7J5oyBa/TIRjyqFFtg==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
-				"gettext-parser": "1.1.0",
-				"nomnom": "1.8.1"
+				"commander": "^6.0.0",
+				"gettext-parser": "2.0.0",
+				"gettext-to-messageformat": "0.3.1"
 			},
 			"bin": {
 				"po2json": "bin/po2json"
 			},
 			"engines": {
-				"node": ">= 0.8.0"
+				"node": ">=10.0"
+			},
+			"peerDependencies": {
+				"commander": "^6.0.0",
+				"gettext-parser": "2.0.0",
+				"gettext-to-messageformat": "0.3.1"
+			}
+		},
+		"node_modules/po2json/node_modules/commander": {
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+			"integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+			"dev": true,
+			"peer": true,
+			"engines": {
+				"node": ">= 6"
 			}
 		},
 		"node_modules/popper.js": {
@@ -23496,13 +23470,37 @@
 			}
 		},
 		"gettext-parser": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-1.1.0.tgz",
-			"integrity": "sha1-LFpmONiTk0ubVQN9CtgstwBLJnk=",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-2.0.0.tgz",
+			"integrity": "sha512-FDs/7XjNw58ToQwJFO7avZZbPecSYgw8PBYhd0An+4JtZSrSzKhEvTsVV2uqdO7VziWTOGSgLGD5YRPdsCjF7Q==",
 			"dev": true,
 			"peer": true,
 			"requires": {
-				"encoding": "^0.1.11"
+				"encoding": "^0.1.12",
+				"safe-buffer": "^5.1.2"
+			}
+		},
+		"gettext-to-messageformat": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/gettext-to-messageformat/-/gettext-to-messageformat-0.3.1.tgz",
+			"integrity": "sha512-UyqIL3Ul4NryU95Wome/qtlcuVIqgEWVIFw0zi7Lv14ACLXfaVDCbrjZ7o+3BZ7u+4NS1mP/2O1eXZoHCoas8g==",
+			"dev": true,
+			"peer": true,
+			"requires": {
+				"gettext-parser": "^1.4.0"
+			},
+			"dependencies": {
+				"gettext-parser": {
+					"version": "1.4.0",
+					"resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-1.4.0.tgz",
+					"integrity": "sha512-sedZYLHlHeBop/gZ1jdg59hlUEcpcZJofLq2JFwJT1zTqAU3l2wFv6IsuwFHGqbiT9DWzMUW4/em2+hspnmMMA==",
+					"dev": true,
+					"peer": true,
+					"requires": {
+						"encoding": "^0.1.12",
+						"safe-buffer": "^5.1.1"
+					}
+				}
 			}
 		},
 		"git-raw-commits": {
@@ -23698,13 +23696,6 @@
 			"integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
 			"dev": true
 		},
-		"has-color": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz",
-			"integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=",
-			"dev": true,
-			"peer": true
-		},
 		"has-flag": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -26031,52 +26022,6 @@
 			"integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
 			"dev": true
 		},
-		"nomnom": {
-			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
-			"integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=",
-			"dev": true,
-			"peer": true,
-			"requires": {
-				"chalk": "~0.4.0",
-				"underscore": "~1.6.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
-					"integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=",
-					"dev": true,
-					"peer": true
-				},
-				"chalk": {
-					"version": "0.4.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
-					"integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
-					"dev": true,
-					"peer": true,
-					"requires": {
-						"ansi-styles": "~1.0.0",
-						"has-color": "~0.1.0",
-						"strip-ansi": "~0.1.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "0.1.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
-					"integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=",
-					"dev": true,
-					"peer": true
-				},
-				"underscore": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-					"integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
-					"dev": true,
-					"peer": true
-				}
-			}
-		},
 		"nopt": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
@@ -26834,23 +26779,33 @@
 			}
 		},
 		"po-loader": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/po-loader/-/po-loader-0.5.0.tgz",
-			"integrity": "sha512-2VyoECqHL6pLUxQqszi9WskwOgRPtO3y+fhVmYMb46L+5S03whRf/lHqWhbTE3AbwEc6DdPuGKFD4IUbWuM/YQ==",
+			"version": "git+ssh://git@github.com/conversejs/po-loader.git#ae72d170bdd0e4066fd8c2af56e1170c59999340",
+			"integrity": "sha512-5v5k7OFHMe/jjuC1rCaaeV5F0mPTPIcOcjlFieWaWkzDMjrU8LXRubth8shYReTJBkn05yNvYkTy51TvtcQ8fw==",
 			"dev": true,
+			"from": "po-loader@conversejs/po-loader#ae72d170bdd0e4066fd8c2af56e1170c59999340",
 			"requires": {
 				"loader-utils": "^1.2.3"
 			}
 		},
 		"po2json": {
-			"version": "0.4.5",
-			"resolved": "https://registry.npmjs.org/po2json/-/po2json-0.4.5.tgz",
-			"integrity": "sha1-R7spUtoy1Yob4vJWpZjuvAt0URg=",
+			"version": "1.0.0-beta-3",
+			"resolved": "https://registry.npmjs.org/po2json/-/po2json-1.0.0-beta-3.tgz",
+			"integrity": "sha512-taS8y6ZEGzPAs0rygW9CuUPY8C3Zgx6cBy31QXxG2JlWS3fLxj/kuD3cbIfXBg30PuYN7J5oyBa/TIRjyqFFtg==",
 			"dev": true,
 			"peer": true,
 			"requires": {
-				"gettext-parser": "1.1.0",
-				"nomnom": "1.8.1"
+				"commander": "^6.0.0",
+				"gettext-parser": "2.0.0",
+				"gettext-to-messageformat": "0.3.1"
+			},
+			"dependencies": {
+				"commander": {
+					"version": "6.2.1",
+					"resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+					"integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+					"dev": true,
+					"peer": true
+				}
 			}
 		},
 		"popper.js": {
diff --git a/package.json b/package.json
index 568b26373..dce3891e9 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "lerna": "^4.0.0",
     "mini-css-extract-plugin": "^2.6.0",
     "minimist": "^1.2.6",
-    "po-loader": "^0.5.0",
+    "po-loader": "conversejs/po-loader#ae72d170bdd0e4066fd8c2af56e1170c59999340",
     "postcss": "^8.4.12",
     "postcss-clean": "1.2.0",
     "postcss-loader": "^6.2.1",