Update translations based on suggestions from Zash on weblate

Makefile

@@ -73,6 +73,7 @@ GETTEXT = $(XGETTEXT) --from-code=UTF-8 --language=JavaScript --keyword=__ --key
 src/i18n/converse.pot: dist/converse-no-dependencies.js
 	$(GETTEXT) 2>&1 > /dev/null; exit $$?;
 	rm dist/converse-no-dependencies.js
+	rm dist/tmp.css
 
 .PHONY: pot
 pot: src/i18n/converse.pot

package-lock.json

@@ -3055,9 +3055,9 @@
       }
     },
     "@discoveryjs/json-ext": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz",
-      "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz",
+      "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
       "dev": true
     },
     "@evocateur/libnpmaccess": {
@@ -5116,24 +5116,24 @@
       }
     },
     "@webpack-cli/configtest": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.2.tgz",
-      "integrity": "sha512-3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.4.tgz",
+      "integrity": "sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ==",
       "dev": true
     },
     "@webpack-cli/info": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.3.tgz",
-      "integrity": "sha512-lLek3/T7u40lTqzCGpC6CAbY6+vXhdhmwFRxZLMnRm6/sIF/7qMpT8MocXCRQfz0JAh63wpbXLMnsQ5162WS7Q==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.3.0.tgz",
+      "integrity": "sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w==",
       "dev": true,
       "requires": {
         "envinfo": "^7.7.3"
       }
     },
     "@webpack-cli/serve": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.3.1.tgz",
-      "integrity": "sha512-0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.1.tgz",
+      "integrity": "sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw==",
       "dev": true
     },
     "@xtuc/ieee754": {
@@ -22544,18 +22544,17 @@
       }
     },
     "webpack-cli": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.6.0.tgz",
-      "integrity": "sha512-9YV+qTcGMjQFiY7Nb1kmnupvb1x40lfpj8pwdO/bom+sQiP4OBMKjHq29YQrlDWDPZO9r/qWaRRywKaRDKqBTA==",
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz",
+      "integrity": "sha512-mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw==",
       "dev": true,
       "requires": {
         "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^1.0.2",
-        "@webpack-cli/info": "^1.2.3",
-        "@webpack-cli/serve": "^1.3.1",
+        "@webpack-cli/configtest": "^1.0.4",
+        "@webpack-cli/info": "^1.3.0",
+        "@webpack-cli/serve": "^1.5.1",
         "colorette": "^1.2.1",
         "commander": "^7.0.0",
-        "enquirer": "^2.3.6",
         "execa": "^5.0.0",
         "fastest-levenshtein": "^1.0.12",
         "import-local": "^3.0.2",
@@ -22565,12 +22564,6 @@
         "webpack-merge": "^5.7.3"
       },
       "dependencies": {
-        "ansi-colors": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-          "dev": true
-        },
         "commander": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
@@ -22588,19 +22581,10 @@
             "which": "^2.0.1"
           }
         },
-        "enquirer": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-          "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-          "dev": true,
-          "requires": {
-            "ansi-colors": "^4.1.1"
-          }
-        },
         "execa": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz",
-          "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==",
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+          "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
           "dev": true,
           "requires": {
             "cross-spawn": "^7.0.3",
@@ -22739,12 +22723,6 @@
           "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
           "dev": true
         },
-        "signal-exit": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-          "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
-          "dev": true
-        },
         "v8-compile-cache": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",

package.json

@@ -110,7 +110,7 @@
     "sinon": "^9.2.4",
     "style-loader": "^0.23.1",
     "webpack": "^5.36.1",
-    "webpack-cli": "^4.6.0",
+    "webpack-cli": "^4.7.2",
     "webpack-dev-server": "^4.0.0-beta.2",
     "webpack-merge": "^5.7.3"
   },

src/i18n/sv/LC_MESSAGES/converse.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Converse.js 6.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-03-17 10:11+0100\n"
-"PO-Revision-Date: 2021-04-09 13:32+0200\n"
+"PO-Revision-Date: 2021-06-25 10:18+0200\n"
 "Last-Translator: Kim Alvefur <zash@zash.se>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/conversejs/"
 "translations/sv/>\n"
@@ -83,21 +83,6 @@ msgstr "Du har inte behörighet att skicka ett meddelande."
 msgid "Sorry, an error occurred while trying to send your message."
 msgstr "Ledsen, ett fel uppstod när meddelandet skulle skickas."
 
-#: dist/converse-no-dependencies.js:51955
-#, javascript-format
-msgid "%1$s has gone offline"
-msgstr ""
-
-#: dist/converse-no-dependencies.js:51959
-#, javascript-format
-msgid "%1$s is busy"
-msgstr ""
-
-#: dist/converse-no-dependencies.js:51961
-#, javascript-format
-msgid "%1$s is online"
-msgstr ""
-
 #: dist/converse-no-dependencies.js:52840
 #: dist/converse-no-dependencies.js:52863
 msgid "Sorry, looks like file upload is not supported by your server."

src/modals/templates/muc-details.js

@@ -16,7 +16,7 @@ const subject = (o) => {
 
 
 export default (o) => {
-    const i18n_address =  __('Groupchat address (JID)');
+    const i18n_address =  __('Groupchat XMPP address');
     const i18n_archiving = __('Message archiving');
     const i18n_archiving_help = __('Messages are archived on the server');
     const i18n_desc = __('Description');

src/modals/templates/profile.js

@@ -91,7 +91,7 @@ export default (o) => {
     const heading_profile = __('Your Profile');
     const i18n_email = __('Email');
     const i18n_fullname = __('Full Name');
-    const i18n_jid = __('XMPP Address (JID)');
+    const i18n_jid = __('XMPP Address');
     const i18n_nickname = __('Nickname');
     const i18n_role = __('Role');
     const i18n_save = __('Save and close');

src/plugins/muc-views/templates/muc-description.js

@@ -3,7 +3,7 @@ import { __ } from 'i18n';
 
 export default  (o) => {
     const i18n_desc = __('Description:');
-    const i18n_jid = __('Groupchat Address (JID):');
+    const i18n_jid = __('Groupchat XMPP Address:');
     const i18n_occ = __('Participants:');
     const i18n_features = __('Features:');
     const i18n_requires_auth = __('Requires authentication');

src/plugins/omemo/utils.js

@@ -313,7 +313,7 @@ async function decryptWhisperMessage (attrs) {
     const from_jid = attrs.from_muc ? attrs.from_real_jid : attrs.from;
     if (!from_jid) {
         Object.assign(attrs, {
-            'error_text': __("Sorry, could not decrypt a received OMEMO because we don't have the JID for that user."),
+            'error_text': __("Sorry, could not decrypt a received OMEMO message because we don't have the XMPP address for that user."),
             'error_type': 'Decryption',
             'is_ephemeral': false,
             'is_error': true,

src/shared/components/image-picker.js

@@ -1,10 +1,10 @@
 import { CustomElement } from './element.js';
 import { __ } from 'i18n';
+import { api } from "@converse/headless/core";
 import { html } from 'lit';
 import { renderAvatar } from "shared/directives/avatar.js";
-import { api } from "@converse/headless/core";
 
-const i18n_alt_avatar = __('Your avatar image');
+const i18n_profile_picture = __('Your profile picture');
 
 
 export default class ImagePicker extends CustomElement {
@@ -24,7 +24,7 @@ export default class ImagePicker extends CustomElement {
             'width': this.width,
         };
         return html`
-            <a class="change-avatar" @click=${this.openFileSelection} title="${i18n_alt_avatar}">
+            <a class="change-avatar" @click=${this.openFileSelection} title="${i18n_profile_picture}">
                 ${ renderAvatar(avatar_data) }
             </a>
             <input @change=${this.updateFilePreview} class="hidden" name="image" type="file"/>

webpack.nodeps.js

@@ -13,7 +13,7 @@ module.exports = merge(common, {
         minimizer: []
     },
     plugins: [
-        new MiniCssExtractPlugin({filename: ''})
+        new MiniCssExtractPlugin({filename: 'tmp.css'})
     ],
     module: {
         rules: [