Manually merge translations from weblate

Makefile

@@ -65,13 +65,12 @@ serve_bg: node_modules
 ########################################################################
 ## Translation machinery
 
-dist/converse-no-dependencies.js: src webpack.common.js webpack.nodeps.js node_modules @converse/headless
+dist/converse-no-dependencies.js: src webpack.common.js webpack.nodeps.js @converse/headless node_modules
 	npm run nodeps
 
 GETTEXT = $(XGETTEXT) --from-code=UTF-8 --language=JavaScript --keyword=__ --keyword=___ --keyword=i18n_ --force-po --output=locale/converse.pot --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=6.0.0 dist/converse-no-dependencies.js -c
 
-.PHONY: pot
-pot: dist/converse-no-dependencies.js
+locale/converse.pot: dist/converse-no-dependencies.js
 	$(GETTEXT) 2>&1 > /dev/null; exit $$?;
 	rm dist/converse-no-dependencies.js
 

package-lock.json

@@ -3594,14 +3594,14 @@
 			}
 		},
 		"@octokit/request": {
-			"version": "5.3.4",
-			"resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.3.4.tgz",
-			"integrity": "sha512-qyj8G8BxQyXjt9Xu6NvfvOr1E0l35lsXtwm3SopsYg/JWXjlsnwqLc8rsD2OLguEL/JjLfBvrXr4az7z8Lch2A==",
+			"version": "5.4.0",
+			"resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.0.tgz",
+			"integrity": "sha512-uAJO6GI8z8VHBqtY7VTL9iFy1Y+UTp5ShpI97tY5z0qBfYKE9rZCRsCm23VmF00x+IoNJ7a0nuVITs/+wS9/mg==",
 			"dev": true,
 			"requires": {
 				"@octokit/endpoint": "^6.0.0",
 				"@octokit/request-error": "^2.0.0",
-				"@octokit/types": "^2.0.0",
+				"@octokit/types": "^2.8.2",
 				"deprecation": "^2.0.0",
 				"is-plain-object": "^3.0.0",
 				"node-fetch": "^2.3.0",
@@ -3682,9 +3682,9 @@
 			}
 		},
 		"@octokit/types": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.5.1.tgz",
-			"integrity": "sha512-q4Wr7RexkPRrkQpXzUYF5Fj/14Mr65RyOHj6B9d/sQACpqGcStkHZj4qMEtlMY5SnD/69jlL9ItGPbDM0dR/dA==",
+			"version": "2.8.2",
+			"resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.8.2.tgz",
+			"integrity": "sha512-8cs4DjRAzFoGo1ieUhDyrTdPK016V3JD/H00nbnojSCUYfOXnnJ1owUaAT/3OebTzp/tgdTG6M+8PdCTJzI+/w==",
 			"dev": true,
 			"requires": {
 				"@types/node": ">= 8"

webpack.nodeps.js

@@ -40,7 +40,9 @@ module.exports = merge(common, {
                 {
                     loader: 'sass-loader',
                     options: {
-                        includePaths: [path.resolve(__dirname, 'node_modules/')]
+                        sassOptions: {
+                            includePaths: [path.resolve(__dirname, 'node_modules/')]
+                        }
                     }
                 }
             ]