diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c90428cbb2..ba42558333 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -63,7 +63,7 @@ jobs: - 5432:5432 redis: - image: 'redis:7.2.5' + image: 'redis:7.4.0' # Set health checks to wait until redis has started options: >- --health-cmd "redis-cli ping" diff --git a/docker-compose-pgsql.yml b/docker-compose-pgsql.yml index e183da06df..f015110d56 100644 --- a/docker-compose-pgsql.yml +++ b/docker-compose-pgsql.yml @@ -24,7 +24,7 @@ services: - postgres-data:/var/lib/postgresql/data redis: - image: redis:7.2.5-alpine + image: redis:7.4.0-alpine restart: unless-stopped command: ['redis-server', '--appendonly', 'yes', '--loglevel', 'warning'] # command: ["redis-server", "--save", "60", "1", "--loglevel", "warning"] # uncomment if you want to use snapshotting instead of AOF diff --git a/docker-compose-redis.yml b/docker-compose-redis.yml index 3aed150f99..2f6d53e577 100644 --- a/docker-compose-redis.yml +++ b/docker-compose-redis.yml @@ -14,7 +14,7 @@ services: - ./install/docker/setup.json:/usr/src/app/setup.json redis: - image: redis:7.2.5-alpine + image: redis:7.4.0-alpine restart: unless-stopped command: ['redis-server', '--appendonly', 'yes', '--loglevel', 'warning'] # command: ["redis-server", "--save", "60", "1", "--loglevel", "warning"] # uncomment if you want to use snapshotting instead of AOF diff --git a/docker-compose.yml b/docker-compose.yml index 3006a54a56..d6d81a5a93 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ services: - mongo-data:/data/db - ./install/docker/mongodb-user-init.js:/docker-entrypoint-initdb.d/user-init.js redis: - image: redis:7.2.5-alpine + image: redis:7.4.0-alpine restart: unless-stopped command: ['redis-server', '--appendonly', 'yes', '--loglevel', 'warning'] # command: ['redis-server', '--save', '60', '1', '--loglevel', 'warning'] # uncomment if you want to use snapshotting instead of AOF diff --git a/install/package.json b/install/package.json index a16271a3f8..932835553a 100644 --- a/install/package.json +++ b/install/package.json @@ -35,7 +35,7 @@ "@isaacs/ttlcache": "1.4.1", "@nodebb/spider-detector": "2.0.3", "@popperjs/core": "2.11.8", - "ace-builds": "1.36.0", + "ace-builds": "1.36.2", "archiver": "7.0.1", "async": "3.2.6", "autoprefixer": "10.4.20", @@ -110,23 +110,23 @@ "nodebb-theme-peace": "2.2.6", "nodebb-theme-persona": "14.0.0-pre.1", "nodebb-widget-essentials": "7.0.21", - "nodemailer": "6.9.14", + "nodemailer": "6.9.15", "nprogress": "0.2.0", "passport": "0.7.0", "passport-http-bearer": "1.0.1", "passport-local": "1.0.0", "pg": "8.12.0", "pg-cursor": "2.11.0", - "postcss": "8.4.41", + "postcss": "8.4.45", "postcss-clean": "1.2.0", "progress-webpack-plugin": "1.0.16", "prompt": "1.3.0", "ioredis": "5.4.1", "rimraf": "5.0.10", "rss": "1.2.2", - "rtlcss": "4.2.0", + "rtlcss": "4.3.0", "sanitize-html": "2.13.0", - "sass": "1.77.8", + "sass": "1.78.0", "semver": "7.6.3", "serve-favicon": "2.5.0", "sharp": "0.32.6", @@ -134,7 +134,7 @@ "socket.io": "4.7.5", "socket.io-client": "4.7.5", "@socket.io/redis-adapter": "8.3.0", - "sortablejs": "1.15.2", + "sortablejs": "1.15.3", "spdx-license-list": "6.9.0", "terser-webpack-plugin": "5.3.10", "textcomplete": "0.18.2", @@ -144,7 +144,7 @@ "toobusy-js": "0.5.1", "tough-cookie": "4.1.4", "validator": "13.12.0", - "webpack": "5.93.0", + "webpack": "5.94.0", "webpack-merge": "6.0.1", "winston": "3.14.2", "workerpool": "9.1.3", @@ -155,17 +155,17 @@ }, "devDependencies": { "@apidevtools/swagger-parser": "10.1.0", - "@commitlint/cli": "19.4.0", - "@commitlint/config-angular": "19.3.0", + "@commitlint/cli": "19.4.1", + "@commitlint/config-angular": "19.4.1", "coveralls": "3.1.1", "eslint": "8.57.0", "eslint-config-nodebb": "0.2.1", - "eslint-plugin-import": "2.29.1", + "eslint-plugin-import": "2.30.0", "grunt": "1.6.1", "grunt-contrib-watch": "1.1.0", "husky": "8.0.3", - "jsdom": "24.1.1", - "lint-staged": "15.2.9", + "jsdom": "25.0.0", + "lint-staged": "15.2.10", "mocha": "10.7.3", "mocha-lcov-reporter": "1.3.0", "mockdate": "3.0.5", @@ -173,7 +173,7 @@ "smtp-server": "3.13.4" }, "optionalDependencies": { - "sass-embedded": "1.77.8" + "sass-embedded": "1.78.0" }, "resolutions": { "*/jquery": "3.7.1" diff --git a/public/language/ar/themes/harmony.json b/public/language/ar/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/ar/themes/harmony.json +++ b/public/language/ar/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/bg/modules.json b/public/language/bg/modules.json index e3ac1095ba..7fc556c4d3 100644 --- a/public/language/bg/modules.json +++ b/public/language/bg/modules.json @@ -1,9 +1,9 @@ { "chat.room-id": "Стая %1", "chat.chatting-with": "Разговор с", - "chat.placeholder": "Type chat message here, drag & drop images", - "chat.placeholder.mobile": "Type chat message", - "chat.placeholder.message-room": "Message #%1", + "chat.placeholder": "Въведете съобщение тук или пуснете снимки", + "chat.placeholder.mobile": "Въведете съобщение", + "chat.placeholder.message-room": "Съобщение #%1", "chat.scroll-up-alert": "Към последните съобщения", "chat.usernames-and-x-others": "%1 и %2 други", "chat.chat-with-usernames": "Разговор с %1", diff --git a/public/language/bg/themes/harmony.json b/public/language/bg/themes/harmony.json index cb21cadb9e..d50645b10c 100644 --- a/public/language/bg/themes/harmony.json +++ b/public/language/bg/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Впишете се или се регистрирайте, за да можете да търсите.", "settings.title": "Настройки на темата", "settings.enableQuickReply": "Включване на бързите отговори", - "settings.enableBreadcrumbs": "Включване на пътечките на страниците", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Центриране на заглавните елементи", "settings.mobileTopicTeasers": "Показване на резюмета на темите на мобилни устройства", "settings.stickyToolbar": "Статична лента с инструменти", diff --git a/public/language/bn/themes/harmony.json b/public/language/bn/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/bn/themes/harmony.json +++ b/public/language/bn/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/cs/themes/harmony.json b/public/language/cs/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/cs/themes/harmony.json +++ b/public/language/cs/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/da/themes/harmony.json b/public/language/da/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/da/themes/harmony.json +++ b/public/language/da/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/de/themes/harmony.json b/public/language/de/themes/harmony.json index d1e2743217..304a3ec023 100644 --- a/public/language/de/themes/harmony.json +++ b/public/language/de/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Anmelden oder registrieren, um zu suchen", "settings.title": "Theme-Einstellungen", "settings.enableQuickReply": "Schnelle Antworten aktivieren", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Header-Elemente zentrieren", "settings.mobileTopicTeasers": "Themen-Vorschau auf Mobilgeräten anzeigen", "settings.stickyToolbar": "Klebrige Toolbar", diff --git a/public/language/el/themes/harmony.json b/public/language/el/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/el/themes/harmony.json +++ b/public/language/el/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/en-GB/error.json b/public/language/en-GB/error.json index fba2f0eaef..211dcae89a 100644 --- a/public/language/en-GB/error.json +++ b/public/language/en-GB/error.json @@ -179,6 +179,7 @@ "cant-chat-with-yourself": "You can't chat with yourself!", "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Chat system disabled", "too-many-messages": "You have sent too many messages, please wait awhile.", "invalid-chat-message": "Invalid chat message", diff --git a/public/language/en-GB/notifications.json b/public/language/en-GB/notifications.json index 065cd6aeed..f4d04ebe27 100644 --- a/public/language/en-GB/notifications.json +++ b/public/language/en-GB/notifications.json @@ -83,6 +83,7 @@ "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Confirmation email sent.", "none": "None", diff --git a/public/language/en-GB/themes/harmony.json b/public/language/en-GB/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/en-GB/themes/harmony.json +++ b/public/language/en-GB/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/en-GB/user.json b/public/language/en-GB/user.json index e2bb9eeb4f..ea2dd301af 100644 --- a/public/language/en-GB/user.json +++ b/public/language/en-GB/user.json @@ -82,6 +82,7 @@ "change-password": "Change Password", "change-password-error": "Invalid Password!", "change-password-error-wrong-current": "Your current password is not correct!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Passwords must match!", "change-password-error-privileges": "You do not have the rights to change this password.", "change-password-success": "Your password is updated!", diff --git a/public/language/en-US/themes/harmony.json b/public/language/en-US/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/en-US/themes/harmony.json +++ b/public/language/en-US/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/en-x-pirate/themes/harmony.json b/public/language/en-x-pirate/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/en-x-pirate/themes/harmony.json +++ b/public/language/en-x-pirate/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/es/themes/harmony.json b/public/language/es/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/es/themes/harmony.json +++ b/public/language/es/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/et/themes/harmony.json b/public/language/et/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/et/themes/harmony.json +++ b/public/language/et/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/fa-IR/themes/harmony.json b/public/language/fa-IR/themes/harmony.json index 25f58407d6..4f0b0e7e95 100644 --- a/public/language/fa-IR/themes/harmony.json +++ b/public/language/fa-IR/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "برای جستجو وارد شوید و یا ثبت نام کنید ", "settings.title": "تنظیمات تم ", "settings.enableQuickReply": "پاسخ سریع را فعال کنید", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "وسط چین کردن عناصر هدر ", "settings.mobileTopicTeasers": "نمایش تیزرهای تاپیک در گوشی", "settings.stickyToolbar": "نوار ابزار چسبیده ", diff --git a/public/language/fi/themes/harmony.json b/public/language/fi/themes/harmony.json index 2d37f09940..ddd27c40fe 100644 --- a/public/language/fi/themes/harmony.json +++ b/public/language/fi/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Etsi kirjautumalla sisään tai luomalla tili.", "settings.title": "Teeman asetukset", "settings.enableQuickReply": "Käytä Pikavastausta", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Keskitä otsakkeen elementit", "settings.mobileTopicTeasers": "Näytä aihe-ehdotukset mobiilinäkymässä", "settings.stickyToolbar": "Kiinteä työkalupalkki", diff --git a/public/language/fr/themes/harmony.json b/public/language/fr/themes/harmony.json index 2957f7ac04..79f78969f1 100644 --- a/public/language/fr/themes/harmony.json +++ b/public/language/fr/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Connectez-vous ou inscrivez-vous pour faire une recherche.", "settings.title": "Configuration du thème", "settings.enableQuickReply": "Activer les réponses rapides", - "settings.enableBreadcrumbs": "Activer le fil d'Ariane", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Centrer les éléments d'en-tête", "settings.mobileTopicTeasers": "Afficher les teasers de sujet sur mobile", "settings.stickyToolbar": "Barre d'outils", diff --git a/public/language/gl/themes/harmony.json b/public/language/gl/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/gl/themes/harmony.json +++ b/public/language/gl/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/he/themes/harmony.json b/public/language/he/themes/harmony.json index 67cdfdf0fe..d7f9d979d5 100644 --- a/public/language/he/themes/harmony.json +++ b/public/language/he/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "התחברו או הירשמו כדי לחפש.", "settings.title": "הגדרות ערכת נושא", "settings.enableQuickReply": "הפעלת תגובה מהירה", - "settings.enableBreadcrumbs": "אפשר סימני דרך", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "מרכוז אלמנטים של כותרת", "settings.mobileTopicTeasers": "הצגת טיזרים של נושאים בנייד", "settings.stickyToolbar": "הצמד את סרגל הכלים בעת גלילה", diff --git a/public/language/hr/themes/harmony.json b/public/language/hr/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/hr/themes/harmony.json +++ b/public/language/hr/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/hu/themes/harmony.json b/public/language/hu/themes/harmony.json index 545972cc95..bee0ab5838 100644 --- a/public/language/hu/themes/harmony.json +++ b/public/language/hu/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Kenyérmorzsa linkek engedélyezése", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/hy/themes/harmony.json b/public/language/hy/themes/harmony.json index 92097bb834..72b6b4166a 100644 --- a/public/language/hy/themes/harmony.json +++ b/public/language/hy/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Մուտք գործել կամ գրանցվել որոնման համար:", "settings.title": "Թեմայի կարգավորումներ", "settings.enableQuickReply": "Միացնել արագ արձագանքը", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Կենտրոնական վերնագրի տարրեր", "settings.mobileTopicTeasers": "Ցույց տալ թեմայի թիզերները բջջայինով", "settings.stickyToolbar": "Կպչուն գործիքագոտի", diff --git a/public/language/id/themes/harmony.json b/public/language/id/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/id/themes/harmony.json +++ b/public/language/id/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/it/modules.json b/public/language/it/modules.json index ff6c5d7f24..4a244172ac 100644 --- a/public/language/it/modules.json +++ b/public/language/it/modules.json @@ -1,9 +1,9 @@ { "chat.room-id": "Stanza %1", "chat.chatting-with": "Messaggia con", - "chat.placeholder": "Type chat message here, drag & drop images", - "chat.placeholder.mobile": "Type chat message", - "chat.placeholder.message-room": "Message #%1", + "chat.placeholder": "Digita qui il messaggio di chat, trascina e rilascia le immagini", + "chat.placeholder.mobile": "Digita il messaggio di chat", + "chat.placeholder.message-room": "Messaggio #%1", "chat.scroll-up-alert": "Vai al messaggio più recente", "chat.usernames-and-x-others": "%1 & %2 altri", "chat.chat-with-usernames": "Chatta con %1", diff --git a/public/language/it/themes/harmony.json b/public/language/it/themes/harmony.json index 130e1f2c48..58fc8b2f23 100644 --- a/public/language/it/themes/harmony.json +++ b/public/language/it/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Accedi o registrati per effettuare la ricerca.", "settings.title": "Impostazioni tema", "settings.enableQuickReply": "Abilita risposta rapida", - "settings.enableBreadcrumbs": "Abilita breadcrumb", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Centra elementi dell'intestazione", "settings.mobileTopicTeasers": "Mostra le anteprime delle discussioni su mobile", "settings.stickyToolbar": "Barra degli strumenti adesiva", diff --git a/public/language/ja/themes/harmony.json b/public/language/ja/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/ja/themes/harmony.json +++ b/public/language/ja/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/ko/themes/harmony.json b/public/language/ko/themes/harmony.json index b60d445f68..e9b4b96845 100644 --- a/public/language/ko/themes/harmony.json +++ b/public/language/ko/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "검색하려면 로그인하거나 등록하세요.", "settings.title": "테마 설정", "settings.enableQuickReply": "빠른 답장 활성화", - "settings.enableBreadcrumbs": "사이트 이동 경로 활성화", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "헤더 요소 가운데 정렬", "settings.mobileTopicTeasers": "모바일에서 토픽 미리보기 표시", "settings.stickyToolbar": "툴바 고정", diff --git a/public/language/lt/themes/harmony.json b/public/language/lt/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/lt/themes/harmony.json +++ b/public/language/lt/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/lv/themes/harmony.json b/public/language/lv/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/lv/themes/harmony.json +++ b/public/language/lv/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/ms/themes/harmony.json b/public/language/ms/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/ms/themes/harmony.json +++ b/public/language/ms/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/nb/themes/harmony.json b/public/language/nb/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/nb/themes/harmony.json +++ b/public/language/nb/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/nl/themes/harmony.json b/public/language/nl/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/nl/themes/harmony.json +++ b/public/language/nl/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/pl/modules.json b/public/language/pl/modules.json index e118ef0ee3..3121924aa0 100644 --- a/public/language/pl/modules.json +++ b/public/language/pl/modules.json @@ -1,9 +1,9 @@ { "chat.room-id": "Pokój %1", "chat.chatting-with": "Czatuj z", - "chat.placeholder": "Type chat message here, drag & drop images", - "chat.placeholder.mobile": "Type chat message", - "chat.placeholder.message-room": "Message #%1", + "chat.placeholder": "Wpisz treść wiadomości lub przeciągnij i upuść obrazki", + "chat.placeholder.mobile": "Wpisz treść wiadomości", + "chat.placeholder.message-room": "Wiadomość #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 i %2 innych", "chat.chat-with-usernames": "Czatuj z %1", diff --git a/public/language/pl/themes/harmony.json b/public/language/pl/themes/harmony.json index e939e1d5d6..6cb857d8ec 100644 --- a/public/language/pl/themes/harmony.json +++ b/public/language/pl/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Aby wyszukiwać zaloguj się lub zarejestruj.", "settings.title": "Ustawienia stylu", "settings.enableQuickReply": "Włącz szybkie odpowiadanie", - "settings.enableBreadcrumbs": "Pokazuj łącza do wszystkich stron nadrzędnych", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Wyśrodkuj elementy nagłówka", "settings.mobileTopicTeasers": "Pokazuj zwiastuny tematów na telefonie", "settings.stickyToolbar": "Przyklejaj pasek narzędziowy", diff --git a/public/language/pt-BR/themes/harmony.json b/public/language/pt-BR/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/pt-BR/themes/harmony.json +++ b/public/language/pt-BR/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/pt-PT/themes/harmony.json b/public/language/pt-PT/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/pt-PT/themes/harmony.json +++ b/public/language/pt-PT/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/ro/themes/harmony.json b/public/language/ro/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/ro/themes/harmony.json +++ b/public/language/ro/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/ru/themes/harmony.json b/public/language/ru/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/ru/themes/harmony.json +++ b/public/language/ru/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/rw/themes/harmony.json b/public/language/rw/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/rw/themes/harmony.json +++ b/public/language/rw/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/sc/themes/harmony.json b/public/language/sc/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/sc/themes/harmony.json +++ b/public/language/sc/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/sk/themes/harmony.json b/public/language/sk/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/sk/themes/harmony.json +++ b/public/language/sk/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/sl/themes/harmony.json b/public/language/sl/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/sl/themes/harmony.json +++ b/public/language/sl/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/sq-AL/themes/harmony.json b/public/language/sq-AL/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/sq-AL/themes/harmony.json +++ b/public/language/sq-AL/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/sr/themes/harmony.json b/public/language/sr/themes/harmony.json index a26a25c0d4..06eb4ec656 100644 --- a/public/language/sr/themes/harmony.json +++ b/public/language/sr/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Пријавите се или региструјте за претрагу.", "settings.title": "Подешавање тема", "settings.enableQuickReply": "Омогући брзи одговор", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Центрирај елементе заглавља", "settings.mobileTopicTeasers": "Прикажи најавне теме на мобилном телефону", "settings.stickyToolbar": "Лепљива трака алата", diff --git a/public/language/sv/admin/extend/widgets.json b/public/language/sv/admin/extend/widgets.json index 5d2832feed..c9a72ed3d0 100644 --- a/public/language/sv/admin/extend/widgets.json +++ b/public/language/sv/admin/extend/widgets.json @@ -26,10 +26,10 @@ "container": "Container", "container.placeholder": "Drag and drop a container or enter HTML here.", "show-to-groups": "Show to groups", - "hide-from-groups": "Hide from groups", + "hide-from-groups": "Dölj från grupper", "start-date": "Start date", "end-date": "End date", "hide-on-mobile": "Hide on mobile", - "hide-drafts": "Hide drafts", - "show-drafts": "Show drafts" + "hide-drafts": "Dölj utkast", + "show-drafts": "Visa utkast" } \ No newline at end of file diff --git a/public/language/sv/admin/manage/categories.json b/public/language/sv/admin/manage/categories.json index 8a9ff471b0..bd13a8cfeb 100644 --- a/public/language/sv/admin/manage/categories.json +++ b/public/language/sv/admin/manage/categories.json @@ -18,7 +18,7 @@ "is-section": "Treat this category as a section", "post-queue": "Post queue", "tag-whitelist": "Tag Whitelist", - "upload-image": "Upload Image", + "upload-image": "Ladda upp bild", "upload": "Upload", "delete-image": "Remove", "category-image": "Category Image", @@ -92,7 +92,7 @@ "alert.find-group": "Find a Group", "alert.group-search": "Search for a group here...", "alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!", - "collapse-all": "Collapse All", + "collapse-all": "Dölj alla", "expand-all": "Expand All", "disable-on-create": "Disable on create", "no-matches": "No matches" diff --git a/public/language/sv/admin/manage/privileges.json b/public/language/sv/admin/manage/privileges.json index 240cff6aa5..b4b76178f7 100644 --- a/public/language/sv/admin/manage/privileges.json +++ b/public/language/sv/admin/manage/privileges.json @@ -9,7 +9,7 @@ "select-clear-all": "Select/Clear All", "chat": "Chat", "chat-with-privileged": "Chat with Privileged", - "upload-images": "Upload Images", + "upload-images": "Ladda upp bilder", "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", diff --git a/public/language/sv/admin/settings/post.json b/public/language/sv/admin/settings/post.json index e000f6b10b..c8e7d79f78 100644 --- a/public/language/sv/admin/settings/post.json +++ b/public/language/sv/admin/settings/post.json @@ -4,11 +4,11 @@ "sorting.post-default": "Default Post Sorting", "sorting.oldest-to-newest": "Oldest to Newest", "sorting.newest-to-oldest": "Newest to Oldest", - "sorting.recently-replied": "Recently Replied", - "sorting.recently-created": "Recently Created", + "sorting.recently-replied": "Nyligen besvarade", + "sorting.recently-created": "Nyligen skapade", "sorting.most-votes": "Most Votes", "sorting.most-posts": "Most Posts", - "sorting.most-views": "Most Views", + "sorting.most-views": "Flest visningar", "sorting.topic-default": "Default Topic Sorting", "length": "Post Length", "post-queue": "Post Queue", diff --git a/public/language/sv/admin/settings/user.json b/public/language/sv/admin/settings/user.json index 528debebaa..1174567a75 100644 --- a/public/language/sv/admin/settings/user.json +++ b/public/language/sv/admin/settings/user.json @@ -79,7 +79,7 @@ "follow-replied-topics": "Follow topics that you reply to", "default-notification-settings": "Default notification settings", "categoryWatchState": "Default category watch state", - "categoryWatchState.tracking": "Tracking", + "categoryWatchState.tracking": "Bevakning", "categoryWatchState.notwatching": "Not Watching", "categoryWatchState.ignoring": "Ignoring", "restrictions-new": "New User Restrictions", diff --git a/public/language/sv/category.json b/public/language/sv/category.json index 8fb311c91a..6afc046f00 100644 --- a/public/language/sv/category.json +++ b/public/language/sv/category.json @@ -10,13 +10,13 @@ "watch": "Bevaka", "ignore": "Ignorera", "watching": "Bevakar", - "tracking": "Tracking", + "tracking": "Bevakning", "not-watching": "Följer inte", "ignoring": "Ignorerar", - "watching.description": "Notify me of new topics.
Show topics in unread & recent", - "tracking.description": "Shows topics in unread & recent", + "watching.description": "Visa ämnen i olästa och senaste", + "tracking.description": "Visa ämnen i olästa och senaste", "not-watching.description": "Visa inte ämnen i olästa, visa i senaste", - "ignoring.description": "Do not show topics in unread & recent", + "ignoring.description": "Visa inte ämnen i olästa och senaste", "watching.message": "Nu får du uppdateringar från den här kategorin och alla underkategorier", "tracking.message": "You are now tracking updates from this category and all subcategories", "notwatching.message": "Du får inga uppdateringar från den här kategorin eller alla underkategorier", diff --git a/public/language/sv/global.json b/public/language/sv/global.json index 35bc3e8c5e..96404fb706 100644 --- a/public/language/sv/global.json +++ b/public/language/sv/global.json @@ -20,8 +20,8 @@ "you-have-successfully-logged-in": "Inloggningen lyckades", "save-changes": "Spara ändringar", "save": "Spara", - "create": "Create", - "cancel": "Cancel", + "create": "Skapa", + "cancel": "Avbryt", "close": "Stäng", "pagination": "Siduppdelning", "pagination.previouspage": "Previous Page", @@ -49,10 +49,10 @@ "header.account": "Account", "header.navigation": "Navigering", "header.manage": "Manage", - "header.drafts": "Drafts", + "header.drafts": "Utkast", "notifications.loading": "Laddar notiser", "chats.loading": "Laddar chattar", - "drafts.loading": "Loading Drafts", + "drafts.loading": "Laddar utkast", "motd.welcome": "Välkommen till NodeBB, framtidens diskussionsplattform.", "alert.success": "Lyckat", "alert.error": "Fel", @@ -67,7 +67,7 @@ "users": "Användare", "topics": "Ämnen", "posts": "Inlägg", - "x-posts": "%1 posts", + "x-posts": "%1 inlägg", "x-topics": "%1 topics", "x-reputation": "%1 reputation", "best": "Bästa", @@ -80,7 +80,7 @@ "downvoters": "Nerröstare", "downvoted": "Nedröstad", "views": "Visningar", - "posters": "Posters", + "posters": "Användare", "reputation": "Rykte", "lastpost": "Senaste inlägget", "firstpost": "Först inlägget", @@ -116,7 +116,7 @@ "guests": "Anonyma", "former-user": "En före detta användare", "system-user": "System", - "unknown-user": "Unknown user", + "unknown-user": "Okänd användare", "updated.title": "Forumet uppdaterades", "updated.message": "Det här forumet har nu uppdaterats till senaste versionen. Klicka här för att ladda om sidan.", "privacy": "Integritet", @@ -140,12 +140,12 @@ "edited": "Redigerad", "disabled": "Avstängd", "select": "Välj", - "selected": "Selected", - "copied": "Copied", + "selected": "Vald", + "copied": "Kopierad", "user-search-prompt": "Skriv något för att hitta användare", - "hidden": "Hidden", - "sort": "Sort", - "actions": "Actions", + "hidden": "Dold", + "sort": "Sortera", + "actions": "Handlingar", "rss-feed": "RSS Feed", "skip-to-content": "Skip to content" } \ No newline at end of file diff --git a/public/language/sv/modules.json b/public/language/sv/modules.json index a4e16381e2..50c7275435 100644 --- a/public/language/sv/modules.json +++ b/public/language/sv/modules.json @@ -79,7 +79,7 @@ "composer.compose": "Komponera", "composer.show-preview": "Visa förhandsgranskning", "composer.hide-preview": "Dölj förhandsgranskning", - "composer.help": "Help", + "composer.help": "Hjälp", "composer.user-said-in": "%1 sa i %2:", "composer.user-said": "%1 sa:", "composer.discard": "Är du säker på att du vill ta bort det här inlägget?", @@ -88,23 +88,23 @@ "composer.uploading": "Laddar upp %1", "composer.formatting.bold": "Fet", "composer.formatting.italic": "Kursiv", - "composer.formatting.heading": "Heading", - "composer.formatting.heading1": "Heading 1", - "composer.formatting.heading2": "Heading 2", - "composer.formatting.heading3": "Heading 3", - "composer.formatting.heading4": "Heading 4", - "composer.formatting.heading5": "Heading 5", - "composer.formatting.heading6": "Heading 6", + "composer.formatting.heading": "Rubrik", + "composer.formatting.heading1": "Rubrik 1", + "composer.formatting.heading2": "Rubrik 2", + "composer.formatting.heading3": "Rubrik 3", + "composer.formatting.heading4": "Rubrik 4", + "composer.formatting.heading5": "Rubrik 5", + "composer.formatting.heading6": "Rubrik 6", "composer.formatting.list": "Lista", "composer.formatting.strikethrough": "Genomstrykning", "composer.formatting.code": "Kod", "composer.formatting.link": "Länk", - "composer.formatting.picture": "Image Link", + "composer.formatting.picture": "Bildlänk", "composer.upload-picture": "Ladda upp bild", "composer.upload-file": "Ladda upp fil", "composer.zen-mode": "Zen Mode", "composer.select-category": "Välj en kategori", - "composer.textarea.placeholder": "Enter your post content here, drag and drop images", + "composer.textarea.placeholder": "Skriv innehåll här, dra och släpp bilder", "composer.post-queue-alert": "Hello👋!
This forum uses a post queue system, since you are a new user your post will be hidden until it is approved by our moderation team.", "composer.schedule-for": "Schedule topic for", "composer.schedule-date": "Date", @@ -112,8 +112,8 @@ "composer.cancel-scheduling": "Cancel Scheduling", "composer.change-schedule-date": "Change Date", "composer.set-schedule-date": "Set Date", - "composer.discard-all-drafts": "Discard all drafts", - "composer.no-drafts": "You have no drafts", + "composer.discard-all-drafts": "Ignorera samtliga utkast", + "composer.no-drafts": "Du har inga utkast", "composer.discard-draft-confirm": "Do you want to discard this draft?", "bootbox.ok": "OK", "bootbox.cancel": "Avbryt", diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json index d7b952e53e..fe21db82df 100644 --- a/public/language/sv/notifications.json +++ b/public/language/sv/notifications.json @@ -1,7 +1,7 @@ { "title": "Notiser", "no-notifs": "Du har inga nya notiser", - "see-all": "All notifications", + "see-all": "Alla notiser", "mark-all-read": "Markera alla notiser som lästa", "back-to-home": "Tillbaka till %1", "outgoing-link": "Utgående länk", @@ -28,10 +28,10 @@ "new-messages-from": "%1 new messages from %2", "new-message-in": "New message in %1", "new-messages-in": "%1 new messages in %2", - "user-posted-in-public-room": "%1 wrote in %3", - "user-posted-in-public-room-dual": "%1 and %2 wrote in %4", - "user-posted-in-public-room-triple": "%1, %2 and %3 wrote in %5", - "user-posted-in-public-room-multiple": "%1, %2 and %3 others wrote in %5", + "user-posted-in-public-room": "%1 skrev i %3", + "user-posted-in-public-room-dual": "%1 och %2 skrev i %4", + "user-posted-in-public-room-triple": "%1, %2 och %3 skrev i %5", + "user-posted-in-public-room-multiple": "%1, %2 och %3 andra skrev i %5", "upvoted-your-post-in": "%1 har röstat upp ditt inlägg i %2", "upvoted-your-post-in-dual": "%1 och %2 har röstat upp ditt inlägg i %3.", "upvoted-your-post-in-triple": "%1, %2 and %3 have upvoted your post in %4.", diff --git a/public/language/sv/recent.json b/public/language/sv/recent.json index 0c8f53ccce..e13316c223 100644 --- a/public/language/sv/recent.json +++ b/public/language/sv/recent.json @@ -7,5 +7,5 @@ "alltime": "Alltid", "no-recent-topics": "Det finns inga olästa ämnen.", "no-popular-topics": "Det finns inga populära ämnen.", - "load-new-posts": "Load new posts" + "load-new-posts": "Ladda nya inlägg" } \ No newline at end of file diff --git a/public/language/sv/tags.json b/public/language/sv/tags.json index 0abd5f5925..6d6a7a9b9e 100644 --- a/public/language/sv/tags.json +++ b/public/language/sv/tags.json @@ -1,17 +1,17 @@ { - "all-tags": "All tags", + "all-tags": "Alla taggar", "no-tag-topics": "Det finns inga ämnen med denna tagg.", "no-tags-found": "No tags found", "tags": "Taggar", - "enter-tags-here": "Enter tags, %1 - %2 characters.", + "enter-tags-here": "Lägg till taggar, %1 - %2 tecken.", "enter-tags-here-short": "Ange taggar...", "no-tags": "Det finns inga taggar ännu.", "select-tags": "Välj Etiketter", "tag-whitelist": "Tag Whitelist", "watching": "Watching", "not-watching": "Not Watching", - "watching.description": "Notify me of new topics.", - "not-watching.description": "Do not notify me of new topics.", + "watching.description": "Notifiera mig vid nya ämnen", + "not-watching.description": "Notifiera mig ej vid nya ämnen", "following-tag.message": "You will now be receiving notifications when somebody posts a topic with this tag.", "not-following-tag.message": "You will not receive notifications when somebody posts a topic with this tag." } \ No newline at end of file diff --git a/public/language/sv/themes/harmony.json b/public/language/sv/themes/harmony.json index 4e75b9f716..14a2604e1c 100644 --- a/public/language/sv/themes/harmony.json +++ b/public/language/sv/themes/harmony.json @@ -1,13 +1,14 @@ { "theme-name": "Harmony Theme", "skins": "Skins", - "collapse": "Collapse", + "collapse": "Dölj", "expand": "Expand", "sidebar-toggle": "Sidebar Toggle", "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json index 62ca0b117b..1f7ea7b781 100644 --- a/public/language/sv/topic.json +++ b/public/language/sv/topic.json @@ -42,8 +42,8 @@ "copy-ip": "Kopiera IP", "ban-ip": "Banna IP", "view-history": "Redigera historik", - "wrote-ago": "wrote ", - "wrote-on": "wrote on ", + "wrote-ago": "skrev ", + "wrote-on": "skrev den ", "replied-to-user-ago": "replied to %3 ", "replied-to-user-on": "replied to %3 on ", "user-locked-topic-ago": "%1 locked this topic %2", @@ -67,8 +67,8 @@ "user-forked-topic-ago": "%1 forked this topic %3", "user-forked-topic-on": "%1 forked this topic on %3", "bookmark-instructions": "Klicka här för att återgå till senast lästa inlägg i detta ämne.", - "flag-post": "Flag this post", - "flag-user": "Flag this user", + "flag-post": "Flagga inlägg", + "flag-user": "Flagga användare", "already-flagged": "Already Flagged", "view-flag-report": "View Flag Report", "resolve-flag": "Resolve Flag", @@ -105,7 +105,7 @@ "thread-tools.change-owner": "Ändra ägare", "thread-tools.select-category": "Välj kategori", "thread-tools.fork": "Grena ämne", - "thread-tools.tag": "Tag Topic", + "thread-tools.tag": "Tagga ämne", "thread-tools.delete": "Ta bort ämne", "thread-tools.delete-posts": "Radera inlägg", "thread-tools.delete-confirm": "Är du säker på att du vill ta bort det här ämnet?", @@ -114,7 +114,7 @@ "thread-tools.purge": "Rensa bort ämne", "thread-tools.purge-confirm": "Är du säker att du vill rensa bort det här ämnet?", "thread-tools.merge-topics": "Slå samman ämnen", - "thread-tools.merge": "Merge Topic", + "thread-tools.merge": "Slå samman ämne", "topic-move-success": "This topic will be moved to \"%1\" shortly. Click here to undo.", "topic-move-multiple-success": "These topics will be moved to \"%1\" shortly. Click here to undo.", "topic-move-all-success": "All topics will be moved to \"%1\" shortly. Click here to undo.", @@ -132,7 +132,7 @@ "bookmark": "Bokmärke", "bookmarks": "Bokmärken", "bookmarks.has-no-bookmarks": "Du har inte bokmärkt några inlägg ännu.", - "copy-permalink": "Copy Permalink", + "copy-permalink": "Kopiera länk", "loading-more-posts": "Laddar fler inlägg", "move-topic": "Flytta ämne", "move-topics": "Flytta ämnen", @@ -159,11 +159,11 @@ "change-owner-instruction": "Klicka på de inlägg du vill tilldela en annan användare", "composer.title-placeholder": "Skriv in ämnets titel här...", "composer.handle-placeholder": "Skriv ditt namn/användarnamn här", - "composer.hide": "Hide", + "composer.hide": "Dölj", "composer.discard": "Avbryt", "composer.submit": "Skicka", "composer.additional-options": "Ytterligare val", - "composer.post-later": "Post Later", + "composer.post-later": "Skicka senare", "composer.schedule": "Schemalägg", "composer.replying-to": "Svarar till %1", "composer.new-topic": "Nytt ämne", @@ -182,11 +182,11 @@ "sort-by": "Sortera på", "oldest-to-newest": "Äldst till nyaste", "newest-to-oldest": "Nyaste till äldst", - "recently-replied": "Recently Replied", - "recently-created": "Recently Created", + "recently-replied": "Nyligen besvarade", + "recently-created": "Nyligen skapade", "most-votes": "Flest röster", "most-posts": "Flest inlägg", - "most-views": "Most Views", + "most-views": "Flest visningar", "stale.title": "Skapa nytt ämne istället?", "stale.warning": "Ämnet du svarar på är ganska gammalt. Vill du skapa ett nytt ämne istället och inkludera en referens till det här ämnet i ditt inlägg?", "stale.create": "Skapa nytt ämne", @@ -210,7 +210,7 @@ "no-more-next-post": "You don't have more posts in this topic", "open-composer": "Open composer", "post-quick-reply": "Quick reply", - "navigator.index": "Post %1 of %2", + "navigator.index": "Inlägg %1 av %2", "navigator.unread": "%1 unread", "upvote-post": "Upvote post", "downvote-post": "Downvote post", diff --git a/public/language/th/modules.json b/public/language/th/modules.json index 4aff8669ce..bbabe4b7c7 100644 --- a/public/language/th/modules.json +++ b/public/language/th/modules.json @@ -1,13 +1,13 @@ { "chat.room-id": "ห้อง %1", "chat.chatting-with": "คุยกับ", - "chat.placeholder": "Type chat message here, drag & drop images", - "chat.placeholder.mobile": "Type chat message", - "chat.placeholder.message-room": "Message #%1", + "chat.placeholder": "พิมพ์ข้อความแชทที่นี่ หรือลากรูปภาพมาปล่อย", + "chat.placeholder.mobile": "พิมพ์ข้อความแชท", + "chat.placeholder.message-room": "ข้อความ %1", "chat.scroll-up-alert": "ไปที่ข้อความล่าสุด", - "chat.usernames-and-x-others": "%1, %2 และผู้อื่น", + "chat.usernames-and-x-others": "%1 และอีก %2 คน", "chat.chat-with-usernames": "แชทกับ %1", - "chat.chat-with-usernames-and-x-others": "แชทกับ %1, %2 และผู้อื่น", + "chat.chat-with-usernames-and-x-others": "แชทกับ %1 และอีก %2 คน", "chat.send": "ส่ง", "chat.no-active": "คุณไม่มีแชทที่คุยอยู่", "chat.user-typing-1": "%1 กำลังพิมพ์ ...", diff --git a/public/language/th/themes/harmony.json b/public/language/th/themes/harmony.json index ad25121e17..0046950148 100644 --- a/public/language/th/themes/harmony.json +++ b/public/language/th/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "เข้าสู่ระบบหรือสมัครบัญชีเพื่อค้นหา", "settings.title": "การตั้งค่าธีม", "settings.enableQuickReply": "เปิดใช้งานการตอบกลับทันที", - "settings.enableBreadcrumbs": "เปิดใช้งานแถบนำทาง", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "ทำให้ข้อความส่วนหัวอยู่ตรงกลาง", "settings.mobileTopicTeasers": "แสดงตัวอย่างเนื้อหากระทู้บนมือถือ", "settings.stickyToolbar": "แถบเครื่องมือแบบ sticky", diff --git a/public/language/tr/themes/harmony.json b/public/language/tr/themes/harmony.json index 4c3582602a..524af6091f 100644 --- a/public/language/tr/themes/harmony.json +++ b/public/language/tr/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Aramak için giriş yapın veya kaydolun", "settings.title": "Tema Ayarları", "settings.enableQuickReply": "Hızlı Cevabı Etkinleştir", - "settings.enableBreadcrumbs": "Başlıklar için yol izini (breadcrumbs) göster", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Tepedeki Merkezi Öğeler", "settings.mobileTopicTeasers": "Başlık Önizlemelerini mobilde göster", "settings.stickyToolbar": "Yapışkan Araç Çubuğu", diff --git a/public/language/uk/themes/harmony.json b/public/language/uk/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/uk/themes/harmony.json +++ b/public/language/uk/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/language/vi/modules.json b/public/language/vi/modules.json index 196f087d6e..f9968b28c3 100644 --- a/public/language/vi/modules.json +++ b/public/language/vi/modules.json @@ -1,9 +1,9 @@ { "chat.room-id": "Phòng %1", "chat.chatting-with": "Trò chuyện với", - "chat.placeholder": "Type chat message here, drag & drop images", - "chat.placeholder.mobile": "Type chat message", - "chat.placeholder.message-room": "Message #%1", + "chat.placeholder": "Nhập tin nhắn trò chuyện vào đây, kéo & thả hình ảnh", + "chat.placeholder.mobile": "Nhập tin nhắn trò chuyện", + "chat.placeholder.message-room": "Tin nhắn #%1", "chat.scroll-up-alert": "Đi đến tin nhắn gần đây nhất", "chat.usernames-and-x-others": "%1 & %2 khác", "chat.chat-with-usernames": "Trò chuyện với %1", diff --git a/public/language/vi/themes/harmony.json b/public/language/vi/themes/harmony.json index 8111fd02d2..23ad044a3b 100644 --- a/public/language/vi/themes/harmony.json +++ b/public/language/vi/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Đăng nhập hoặc đăng ký để tìm kiếm.", "settings.title": "Cài đặt chủ đề", "settings.enableQuickReply": "Bật trả lời nhanh", - "settings.enableBreadcrumbs": "Bật dẫn hướng đường dẫn", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Yếu tố tiêu đề trung tâm", "settings.mobileTopicTeasers": "Hiển thị đoạn giới thiệu chủ đề trên di động", "settings.stickyToolbar": "Thanh công cụ cố định", diff --git a/public/language/zh-CN/admin/dashboard.json b/public/language/zh-CN/admin/dashboard.json index c32f5ee429..d4c79cd879 100644 --- a/public/language/zh-CN/admin/dashboard.json +++ b/public/language/zh-CN/admin/dashboard.json @@ -97,5 +97,5 @@ "clear-search-history-confirm": "您确定您要删除搜索历史吗？", "search-term": "内容", "search-count": "计数", - "view-all": "浏览全部" + "view-all": "查看全部" } diff --git a/public/language/zh-CN/admin/manage/privileges.json b/public/language/zh-CN/admin/manage/privileges.json index 7bb5c09667..5c80c8c64a 100644 --- a/public/language/zh-CN/admin/manage/privileges.json +++ b/public/language/zh-CN/admin/manage/privileges.json @@ -18,9 +18,9 @@ "search-content": "搜索内容", "search-users": "搜索用户", "search-tags": "搜索标签", - "view-users": "浏览用户", - "view-tags": "浏览标签", - "view-groups": "浏览群组", + "view-users": "查看用户", + "view-tags": "查看标签", + "view-groups": "查看群组", "allow-local-login": "本地登录", "allow-group-creation": "群组创建", "view-users-info": "查看用户信息", diff --git a/public/language/zh-CN/themes/harmony.json b/public/language/zh-CN/themes/harmony.json index 62c9c1b4c6..735b239628 100644 --- a/public/language/zh-CN/themes/harmony.json +++ b/public/language/zh-CN/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "登录或注册以进行搜索。", "settings.title": "主题设置", "settings.enableQuickReply": "启用快速回复", - "settings.enableBreadcrumbs": "启用面包屑导航", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "标题元素居中", "settings.mobileTopicTeasers": "在移动设备显示话题预告", "settings.stickyToolbar": "附着工具条", diff --git a/public/language/zh-CN/user.json b/public/language/zh-CN/user.json index 1a38157a1a..21bcb16778 100644 --- a/public/language/zh-CN/user.json +++ b/public/language/zh-CN/user.json @@ -166,7 +166,7 @@ "info.latest-flags": "最新举报", "info.profile": "资料", "info.post": "帖子", - "info.view-flag": "View flag", + "info.view-flag": "查看举报", "info.reported-by": "举报者：", "info.no-flags": "没有找到被举报的帖子", "info.ban-history": "最近封禁历史", diff --git a/public/language/zh-TW/themes/harmony.json b/public/language/zh-TW/themes/harmony.json index 4e75b9f716..01038d7641 100644 --- a/public/language/zh-TW/themes/harmony.json +++ b/public/language/zh-TW/themes/harmony.json @@ -7,7 +7,8 @@ "login-register-to-search": "Login or register to search.", "settings.title": "Theme settings", "settings.enableQuickReply": "Enable quick reply", - "settings.enableBreadcrumbs": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Show breadcrumbs in Category and Topic pages", + "settings.enableBreadcrumbs.why": "Breadcrumbs are visible in most pages for ease-of-navigation. The base design of the category and topic pages has alternative means to link back to parent pages, but the breadcrumb can be toggled off to reduce clutter.", "settings.centerHeaderElements": "Center header elements", "settings.mobileTopicTeasers": "Show topic teasers on mobile", "settings.stickyToolbar": "Sticky toolbar", diff --git a/public/openapi/read/confirm/code.yaml b/public/openapi/read/confirm/code.yaml index 9d55b016c1..9677cb1a66 100644 --- a/public/openapi/read/confirm/code.yaml +++ b/public/openapi/read/confirm/code.yaml @@ -24,6 +24,9 @@ get: error: type: string description: Translation key for client-side localisation + alreadyValidated: + type: boolean + description: set to true if the email was already validated required: - title - $ref: ../../components/schemas/CommonProps.yaml#/CommonProps \ No newline at end of file diff --git a/public/openapi/write/users/uid/password.yaml b/public/openapi/write/users/uid/password.yaml index 1a52f85e53..7d1dc2e938 100644 --- a/public/openapi/write/users/uid/password.yaml +++ b/public/openapi/write/users/uid/password.yaml @@ -23,7 +23,7 @@ put: example: '123456' newPassword: type: string - example: '123456' + example: '654321' required: - newPassword responses: diff --git a/src/controllers/index.js b/src/controllers/index.js index 3dcc81dade..9c01ba333b 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -221,20 +221,31 @@ Controllers.registerInterstitial = async function (req, res, next) { } }; -Controllers.confirmEmail = async (req, res, next) => { +Controllers.confirmEmail = async (req, res) => { + function renderPage(opts = {}) { + res.render('confirm', { + title: '[[pages:confirm]]', + ...opts, + }); + } try { + if (req.loggedIn) { + const emailValidated = await user.getUserField(req.uid, 'email:confirmed'); + if (emailValidated) { + return renderPage({ alreadyValidated: true }); + } + } await user.email.confirmByCode(req.params.code, req.session.id); if (req.session.registration) { // After confirmation, no need to send user back to email change form delete req.session.registration.updateEmail; } - res.render('confirm', { - title: '[[pages:confirm]]', - }); + renderPage(); } catch (e) { - if (e.message === '[[error:invalid-data]]') { - return next(); + if (e.message === '[[error:invalid-data]]' || e.message === '[[error:confirm-email-expired]]') { + renderPage({ error: true }); + return; } throw e; diff --git a/src/messaging/index.js b/src/messaging/index.js index 7a2cd617a6..eda2bd4ac0 100644 --- a/src/messaging/index.js +++ b/src/messaging/index.js @@ -363,7 +363,10 @@ Messaging.canMessageUser = async (uid, toUid) => { user.blocks.is(uid, toUid), ]); - if (isBlocked || (settings.restrictChat && !isAdmin && !isModerator && !isFollowing)) { + if (isBlocked) { + throw new Error('[[error:chat-user-blocked]]'); + } + if (settings.restrictChat && !isAdmin && !isModerator && !isFollowing) { throw new Error('[[error:chat-restricted]]'); } diff --git a/src/user/profile.js b/src/user/profile.js index e8c654f0cb..340358ad55 100644 --- a/src/user/profile.js +++ b/src/user/profile.js @@ -319,6 +319,9 @@ module.exports = function (User) { if (!correct) { throw new Error('[[user:change-password-error-wrong-current]]'); } + if (data.currentPassword === data.newPassword) { + throw new Error('[[user:change-password-error-same-password]]'); + } } const hashedPassword = await User.hashPassword(data.newPassword); diff --git a/src/views/confirm.tpl b/src/views/confirm.tpl index fb81b63823..0235ced0d5 100644 --- a/src/views/confirm.tpl +++ b/src/views/confirm.tpl @@ -1,7 +1,19 @@ +{{{ if alreadyValidated }}} +
+

[[notifications:email-confirm-error-message-already-validated]]

+{{{ end }}} + +{{{ if error }}} +
+

[[notifications:email-confirm-error-message]]

+{{{ end }}} + +{{{ if (!error && !alreadyValidated )}}}
[[notifications:email-confirmed]]

[[notifications:email-confirmed-message]]

-

+{{{ end }}} +

[[notifications:back-to-home, {config.siteTitle}]]

-
+
\ No newline at end of file diff --git a/src/views/reset_code.tpl b/src/views/reset_code.tpl index 03e22692a8..94bbf9fe75 100644 --- a/src/views/reset_code.tpl +++ b/src/views/reset_code.tpl @@ -1,40 +1,42 @@ -
- {{{ if valid }}} -
- {{{ if displayExpiryNotice }}} -
- [[reset_password:password-expired]] +
+
+ {{{ if valid }}} +
+ {{{ if displayExpiryNotice }}} +
+ [[reset_password:password-expired]] +
+ {{{ end }}} + + +
+
+ + +
+
+ + +
+ +
+
+ {{{ else }}} +
+
+
[[reset_password:wrong-reset-code.title]]
+
+
+

[[reset_password:wrong-reset-code.message]]

+
{{{ end }}} - - -
-
- -
-
-
- -
-
- -
- {{{ else }}} -
-
- [[reset_password:wrong-reset-code.title]] -
-
-

[[reset_password:wrong-reset-code.message]]

-
-
- {{{ end }}}
\ No newline at end of file diff --git a/test/api.js b/test/api.js index c90aa3c3a1..d10433a88b 100644 --- a/test/api.js +++ b/test/api.js @@ -575,8 +575,15 @@ describe('API', async () => { const reloginPaths = ['GET /api/user/{userslug}/edit/email', 'PUT /users/{uid}/password', 'DELETE /users/{uid}/sessions/{uuid}']; if (reloginPaths.includes(`${method.toUpperCase()} ${path}`)) { ({ jar } = await helpers.loginUser('admin', '123456')); - const sessionIds = await db.getSortedSetRange('uid:1:sessions', 0, -1); - const sessObj = await db.sessionStoreGet(sessionIds[0]); + let sessionIds = await db.getSortedSetRange('uid:1:sessions', 0, -1); + let sessObj = await db.sessionStoreGet(sessionIds[0]); + if (!sessObj) { + // password changed so login with new pwd + ({ jar } = await helpers.loginUser('admin', '654321')); + sessionIds = await db.getSortedSetRange('uid:1:sessions', 0, -1); + sessObj = await db.sessionStoreGet(sessionIds[0]); + } + const { uuid } = sessObj.meta; mocks.delete['/users/{uid}/sessions/{uuid}'][1].example = uuid; diff --git a/test/user.js b/test/user.js index 25c0ddc6f0..9b7fc88f18 100644 --- a/test/user.js +++ b/test/user.js @@ -776,6 +776,18 @@ describe('User', () => { assert(correct); }); + it('should not let user change their password to their current password', async () => { + const uid = await User.create({ username: 'changepasswordsame', password: '123456' }); + await assert.rejects( + apiUser.changePassword({ uid: uid }, { + uid: uid, + newPassword: '123456', + currentPassword: '123456', + }), + { message: '[[user:change-password-error-same-password]]' }, + ); + }); + it('should not let user change another user\'s password', async () => { const regularUserUid = await User.create({ username: 'regularuserpwdchange', password: 'regularuser1234' }); const uid = await User.create({ username: 'changeadminpwd1', password: '123456' });