diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 67aee91b9a..742f443f9c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -61,7 +61,7 @@ jobs: key: var-cache-node-modules-${{ hashFiles('Dockerfile', 'install/package.json') }} - name: Build and push Docker images - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: cache-from: type=gha cache-to: type=gha,mode=min diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b2a52caf42..ba42558333 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -63,7 +63,7 @@ jobs: - 5432:5432 redis: - image: 'redis:7.2.4' + image: 'redis:7.4.0' # Set health checks to wait until redis has started options: >- --health-cmd "redis-cli ping" diff --git a/CHANGELOG.md b/CHANGELOG.md index b66481805a..731e39ccc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,81 @@ +#### v3.8.4 (2024-08-01) + +##### Chores + +* up widgets (d1663ac2) +* up widgets (cb4bf9dd) +* up persona (324610de) +* incrementing version number - v3.8.3 (97ce2c44) +* update changelog for v3.8.3 (2a239a79) +* incrementing version number - v3.8.2 (72d91251) +* incrementing version number - v3.8.1 (527326f7) +* incrementing version number - v3.8.0 (e228a6eb) +* incrementing version number - v3.7.5 (6882894d) +* incrementing version number - v3.7.4 (6678744c) +* incrementing version number - v3.7.3 (2d62b6f6) +* incrementing version number - v3.7.2 (cc257e7e) +* incrementing version number - v3.7.1 (712365a5) +* incrementing version number - v3.7.0 (9a6153d7) +* incrementing version number - v3.6.7 (86a17e38) +* incrementing version number - v3.6.6 (6604bf37) +* incrementing version number - v3.6.5 (6c653625) +* incrementing version number - v3.6.4 (83d131b4) +* incrementing version number - v3.6.3 (fc7d2bfd) +* incrementing version number - v3.6.2 (0f577a57) +* incrementing version number - v3.6.1 (f1a69468) +* incrementing version number - v3.6.0 (4cdf85f8) +* incrementing version number - v3.5.3 (ed0e8783) +* incrementing version number - v3.5.2 (52fbb2da) +* incrementing version number - v3.5.1 (4c543488) +* incrementing version number - v3.5.0 (d06fb4f0) +* incrementing version number - v3.4.3 (5c984250) +* incrementing version number - v3.4.2 (3f0dac38) +* incrementing version number - v3.4.1 (01e69574) +* incrementing version number - v3.4.0 (fd9247c5) +* incrementing version number - v3.3.9 (5805e770) +* incrementing version number - v3.3.8 (a5603565) +* incrementing version number - v3.3.7 (b26f1744) +* incrementing version number - v3.3.6 (7fb38792) +* incrementing version number - v3.3.4 (a67f84ea) +* incrementing version number - v3.3.3 (f94d239b) +* incrementing version number - v3.3.2 (ec9dac97) +* incrementing version number - v3.3.1 (151cc68f) +* incrementing version number - v3.3.0 (fc1ad70f) +* incrementing version number - v3.2.3 (b06d3e63) +* incrementing version number - v3.2.2 (758ecfcd) +* incrementing version number - v3.2.1 (20145074) +* incrementing version number - v3.2.0 (9ecac38e) +* incrementing version number - v3.1.7 (0b4e81ab) +* incrementing version number - v3.1.6 (b3a3b130) +* incrementing version number - v3.1.5 (ec19343a) +* incrementing version number - v3.1.4 (2452783c) +* incrementing version number - v3.1.3 (3b4e9d3f) +* incrementing version number - v3.1.2 (40fa3489) +* incrementing version number - v3.1.1 (40250733) +* incrementing version number - v3.1.0 (0cb386bd) +* incrementing version number - v3.0.1 (26f6ea49) +* incrementing version number - v3.0.0 (224e08cd) + +##### New Features + +* update chat teasers when a new chat starts, closes #12713 (0204f2aa) +* add downvoteVisibility setting, closes #12698 (269fc068) + +##### Bug Fixes + +* prevent category filter to go to selected cid (10c5cd4c) +* add sizes to maskable so it doesnt crash chrome application tab (ccc86825) +* post preview not working on parent post (a28dd70f) + +##### Refactors + +* hooks page design (cea18d0c) +* closes #12699, allow boolean false for log-colorize (42ac1f9d) + +##### Tests + +* test fix maybe (a73f269f) + #### v3.8.3 (2024-06-27) ##### Chores diff --git a/docker-compose-pgsql.yml b/docker-compose-pgsql.yml index 64619e4c0f..f015110d56 100644 --- a/docker-compose-pgsql.yml +++ b/docker-compose-pgsql.yml @@ -14,7 +14,7 @@ services: - ./install/docker/setup.json:/usr/src/app/setup.json postgres: - image: postgres:16.3-alpine + image: postgres:16.4-alpine restart: unless-stopped environment: POSTGRES_USER: nodebb @@ -24,7 +24,7 @@ services: - postgres-data:/var/lib/postgresql/data redis: - image: redis:7.2.4-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 7d6ddf09ca..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.4-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 0742c437a6..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.4-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 @@ -36,7 +36,7 @@ services: - redis postgres: - image: postgres:16.1-alpine + image: postgres:16.4-alpine restart: unless-stopped environment: POSTGRES_USER: nodebb diff --git a/install/package.json b/install/package.json index cb5eb4e4ea..26b77cc3ca 100644 --- a/install/package.json +++ b/install/package.json @@ -29,43 +29,46 @@ }, "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", - "@fontsource/inter": "5.0.18", - "@fontsource/poppins": "5.0.14", - "@fortawesome/fontawesome-free": "6.5.2", + "@fontsource/inter": "5.1.0", + "@fontsource/poppins": "5.1.0", + "@fortawesome/fontawesome-free": "6.6.0", "@isaacs/ttlcache": "1.4.1", "@nodebb/spider-detector": "2.0.3", "@popperjs/core": "2.11.8", - "ace-builds": "1.33.2", + "@textcomplete/contenteditable": "0.1.13", + "@textcomplete/core": "0.1.13", + "@textcomplete/textarea": "0.1.13", + "ace-builds": "1.36.2", "archiver": "7.0.1", - "async": "3.2.5", - "autoprefixer": "10.4.19", + "async": "3.2.6", + "autoprefixer": "10.4.20", "bcryptjs": "2.4.3", "benchpressjs": "2.5.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "bootbox": "6.0.0", "bootstrap": "5.3.3", "bootswatch": "5.3.3", "chalk": "4.1.2", - "chart.js": "4.4.2", + "chart.js": "4.4.4", "cli-graph": "3.2.2", "clipboard": "2.0.11", "colors": "1.4.0", "commander": "12.0.0", - "compare-versions": "6.1.0", + "compare-versions": "6.1.1", "compression": "1.7.4", "connect-flash": "0.1.1", "connect-mongo": "5.1.0", "connect-multiparty": "2.2.0", - "connect-pg-simple": "9.0.1", + "connect-pg-simple": "10.0.0", "connect-redis": "7.1.1", "cookie-parser": "1.4.6", "cron": "3.1.7", "cropperjs": "1.6.2", "csrf-sync": "4.0.3", "daemon": "1.1.0", - "diff": "5.2.0", - "esbuild": "0.21.2", - "express": "4.19.2", + "diff": "7.0.0", + "esbuild": "0.23.1", + "express": "4.21.0", "express-session": "1.18.0", "express-useragent": "1.0.15", "fetch-cookie": "3.0.1", @@ -80,60 +83,60 @@ "jquery-deserialize": "2.0.0", "jquery-form": "4.3.0", "jquery-serializeobject": "1.0.0", - "jquery-ui": "1.13.3", + "jquery-ui": "1.14.0", "jsesc": "3.0.2", "json2csv": "5.0.7", "jsonwebtoken": "9.0.2", "lodash": "4.17.21", "logrotate-stream": "0.2.9", - "lru-cache": "10.2.2", + "lru-cache": "10.4.3", "mime": "3.0.0", "mkdirp": "3.0.1", - "mongodb": "6.6.1", + "mongodb": "6.9.0", "morgan": "1.10.0", "mousetrap": "1.6.5", "multiparty": "4.2.3", "nconf": "0.12.1", - "nodebb-plugin-2factor": "7.5.3", - "nodebb-plugin-composer-default": "10.2.36", + "nodebb-plugin-2factor": "7.5.5", + "nodebb-plugin-composer-default": "10.2.39", "nodebb-plugin-dbsearch": "6.2.5", "nodebb-plugin-emoji": "5.1.15", "nodebb-plugin-emoji-android": "4.0.0", - "nodebb-plugin-markdown": "12.2.6", + "nodebb-plugin-markdown": "12.2.8", "nodebb-plugin-mentions": "4.4.3", - "nodebb-plugin-ntfy": "1.7.4", + "nodebb-plugin-ntfy": "1.7.7", "nodebb-plugin-spam-be-gone": "2.2.2", "nodebb-rewards-essentials": "1.0.0", - "nodebb-theme-harmony": "1.2.63", + "nodebb-theme-harmony": "1.2.69", "nodebb-theme-lavender": "7.1.8", - "nodebb-theme-peace": "2.2.6", - "nodebb-theme-persona": "13.3.25", - "nodebb-widget-essentials": "7.0.18", - "nodemailer": "6.9.13", + "nodebb-theme-peace": "2.2.7", + "nodebb-theme-persona": "13.3.36", + "nodebb-widget-essentials": "7.0.28", + "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.11.5", - "pg-cursor": "2.10.5", - "postcss": "8.4.38", + "pg": "8.13.0", + "pg-cursor": "2.12.0", + "postcss": "8.4.47", "postcss-clean": "1.2.0", "progress-webpack-plugin": "1.0.16", "prompt": "1.3.0", "ioredis": "5.4.1", - "rimraf": "5.0.7", + "rimraf": "5.0.10", "rss": "1.2.2", - "rtlcss": "4.1.1", + "rtlcss": "4.3.0", "sanitize-html": "2.13.0", - "sass": "1.77.1", - "semver": "7.6.2", + "sass": "1.79.1", + "semver": "7.6.3", "serve-favicon": "2.5.0", "sharp": "0.32.6", - "sitemap": "7.1.1", + "sitemap": "8.0.0", "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", @@ -141,12 +144,12 @@ "timeago": "1.6.7", "tinycon": "0.6.8", "toobusy-js": "0.5.1", - "tough-cookie": "4.1.4", + "tough-cookie": "5.0.0", "validator": "13.12.0", - "webpack": "5.91.0", - "webpack-merge": "5.10.0", - "winston": "3.13.0", - "workerpool": "9.1.1", + "webpack": "5.94.0", + "webpack-merge": "6.0.1", + "winston": "3.14.2", + "workerpool": "9.1.3", "xml": "1.0.1", "xregexp": "5.1.1", "yargs": "17.7.2", @@ -154,25 +157,25 @@ }, "devDependencies": { "@apidevtools/swagger-parser": "10.1.0", - "@commitlint/cli": "19.3.0", - "@commitlint/config-angular": "19.3.0", + "@commitlint/cli": "19.5.0", + "@commitlint/config-angular": "19.5.0", "coveralls": "3.1.1", - "eslint": "8.57.0", + "eslint": "8.57.1", "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.0.0", - "lint-staged": "15.2.2", - "mocha": "10.4.0", + "jsdom": "25.0.0", + "lint-staged": "15.2.10", + "mocha": "10.7.3", "mocha-lcov-reporter": "1.3.0", "mockdate": "3.0.5", - "nyc": "15.1.0", - "smtp-server": "3.13.4" + "nyc": "17.0.0", + "smtp-server": "3.13.5" }, "optionalDependencies": { - "sass-embedded": "1.77.1" + "sass-embedded": "1.79.1" }, "resolutions": { "*/jquery": "3.7.1" @@ -195,4 +198,4 @@ "url": "https://github.com/barisusakli" } ] -} \ No newline at end of file +} diff --git a/public/language/ar/admin/development/info.json b/public/language/ar/admin/development/info.json index 7948d86494..4c97beee13 100644 --- a/public/language/ar/admin/development/info.json +++ b/public/language/ar/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "رقم الآي بي %1 ", "nodes-responded": "عدد %1 نقطة/نقاط استجابوا خلال %2 جزء من الثانية.", "host": "المضيف", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/ar/admin/extend/widgets.json b/public/language/ar/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/ar/admin/extend/widgets.json +++ b/public/language/ar/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/ar/admin/settings/reputation.json b/public/language/ar/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/ar/admin/settings/reputation.json +++ b/public/language/ar/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/ar/error.json b/public/language/ar/error.json index e0c3b1b6c0..1bda94766d 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "نأسف، ( عني ) لا يمكن أن يكون أكثر من %1 حرف.", "cant-chat-with-yourself": "لايمكنك فتح محادثة مع نفسك", "chat-restricted": "هذا المستخدم عطل المحادثات الواردة عليه. يجب أن يتبعك حتى تتمكن من فتح محادثة معه.", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "نظام المحادثة معطل.", "too-many-messages": "لقد أرسلت الكثير من الرسائل، الرجاء اﻹنتظار قليلاً", "invalid-chat-message": "الرسالة غير صالحة.", diff --git a/public/language/ar/modules.json b/public/language/ar/modules.json index 051ccb5798..d9e5d89185 100644 --- a/public/language/ar/modules.json +++ b/public/language/ar/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chat with", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json index 2dea48c500..df92c2b681 100644 --- a/public/language/ar/notifications.json +++ b/public/language/ar/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 أنشأ موضوعًا جديدًا: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 صار يتابعك.", "user-started-following-you-dual": "%1 and %2 started following you.", @@ -75,6 +75,7 @@ "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني", "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.", "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "تم إرسال بريد التفعيل.", "none": "None", "notification-only": "التنبيهات فقط", diff --git a/public/language/ar/post-queue.json b/public/language/ar/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/ar/post-queue.json +++ b/public/language/ar/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/ar/user.json b/public/language/ar/user.json index ff6035449c..a5faecb2dd 100644 --- a/public/language/ar/user.json +++ b/public/language/ar/user.json @@ -78,6 +78,7 @@ "change-password": "تغيير كلمة السر", "change-password-error": "كلمة سر غير صحيحة", "change-password-error-wrong-current": "كلمة السر الحالية ليست صحيحة", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "كلمة السر غير مطابقة لتأكيد كلمة السر", "change-password-error-privileges": "ليس لديك الصلاحيات الكافية لتغيير كلمة السر هذه.", "change-password-success": "تم تحديث كلمة السر خاصتك.", diff --git a/public/language/ar/users.json b/public/language/ar/users.json index b34cb35a49..5c2d5bee1d 100644 --- a/public/language/ar/users.json +++ b/public/language/ar/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "أحدث الأعضاء", "top-posters": "اﻷكثر مشاركة", "most-reputation": "أعلى سمعة", diff --git a/public/language/bg/admin/development/info.json b/public/language/bg/admin/development/info.json index 08f70c0692..71f1e63c4b 100644 --- a/public/language/bg/admin/development/info.json +++ b/public/language/bg/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 възела отговориха в рамките на %2мсек!", "host": "сървър", - "primary": "основен / изпълнение на задачите", + "primary": "основен / задачи", "pid": "ид. на процеса", "nodejs": "nodejs", "online": "на линия", @@ -19,6 +19,7 @@ "registered": "Регистрирани", "sockets": "Сокети", + "connection-count": "Брой връзки", "guests": "Гости", "info": "Информация" diff --git a/public/language/bg/admin/extend/widgets.json b/public/language/bg/admin/extend/widgets.json index 839138cef2..b0f6a79f3c 100644 --- a/public/language/bg/admin/extend/widgets.json +++ b/public/language/bg/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Карта", "container.card-header": "Заглавна част на карта", "container.card-body": "Основна част на карта", + "container.title": "Заглавие", + "container.body": "Съдържание", "container.alert": "Предупреждение", "alert.confirm-delete": "Наистина ли искате да изтриете джаджата?", diff --git a/public/language/bg/admin/settings/reputation.json b/public/language/bg/admin/settings/reputation.json index 7a288c6f04..2c82e22de3 100644 --- a/public/language/bg/admin/settings/reputation.json +++ b/public/language/bg/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Настройки за репутацията", "disable": "Изключване на системата за репутация", "disable-down-voting": "Забрана на отрицателното гласуване", - "votes-are-public": "Всички гласувания са публични", + "upvote-visibility": "Видимост на положителните гласове", + "upvote-visibility-all": "Всички могат да виждат положителните гласове", + "upvote-visibility-loggedin": "Само вписаните потребители могат да виждат положителните гласове", + "upvote-visibility-privileged": "Само потребителите с по-високи правомощия (като администратори и модератори) могат да виждат положителните гласове", + "downvote-visibility": "Видимост на отрицателните гласове", + "downvote-visibility-all": "Всички могат да виждат отрицателните гласове", + "downvote-visibility-loggedin": "Само вписаните потребители могат да виждат отрицателните гласове", + "downvote-visibility-privileged": "Само потребителите с по-високи правомощия (като администратори и модератори) могат да виждат отрицателните гласове", "thresholds": "Ограничения на дейността", "min-rep-upvote": "Минимална репутация, необходима за положително гласуване за публикации", "upvotes-per-day": "Положителни гласувания за ден (задайте 0 за неограничен брой)", diff --git a/public/language/bg/error.json b/public/language/bg/error.json index 568cefaf0f..63f49e1fda 100644 --- a/public/language/bg/error.json +++ b/public/language/bg/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Съжаляваме, но информацията за Вас трябва да съдържа не повече от %1 символ(а).", "cant-chat-with-yourself": "Не можете да пишете съобщение на себе си!", "chat-restricted": "Този потребител е ограничил съобщенията до себе си. Той трябва първо да Ви последва, преди да можете да си пишете с него.", + "chat-user-blocked": "Бяхте блокиран(а) от този потребител.", "chat-disabled": "Системата за разговори е изключена", "too-many-messages": "Изпратили сте твърде много съобщения. Моля, изчакайте малко.", "invalid-chat-message": "Неправилно съобщение", diff --git a/public/language/bg/modules.json b/public/language/bg/modules.json index b3a4e6d996..7fc556c4d3 100644 --- a/public/language/bg/modules.json +++ b/public/language/bg/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Стая %1", "chat.chatting-with": "Разговор с", - "chat.placeholder": "Въведете съобщение тук или пуснете снимки и натиснете Ентер за изпращане", - "chat.placeholder.mobile": "Въведете съобщение тук", + "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/notifications.json b/public/language/bg/notifications.json index 213d72f9d4..0659a9e640 100644 --- a/public/language/bg/notifications.json +++ b/public/language/bg/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 и %3 други публикуваха отговори на: %4", "user-posted-topic": "%1 публикува нова тема: %2", "user-edited-post": "%1 редактира публикация в %2", - "user-posted-topic-with-tag": "%1 публикува нова тема с етикет %2", - "user-posted-topic-with-tag-dual": "%1 публикува нова тема с етикети %2 и %3", - "user-posted-topic-with-tag-triple": "%1 публикува нова тема с етикети %2, %3 и %4", - "user-posted-topic-with-tag-multiple": "%1 публикува нова тема с етикети %2", + "user-posted-topic-with-tag": "%1 публикува %2 (с етикет %3)", + "user-posted-topic-with-tag-dual": "%1 публикува %2 (с етикети %3 и %4)", + "user-posted-topic-with-tag-triple": "%1 публикува %2 (с етикети %3, %4 и %5)", + "user-posted-topic-with-tag-multiple": "%1 публикува %2 (с етикет %3)", "user-posted-topic-in-category": "%1 публикува нова тема в %2", "user-started-following-you": "%1 започна да Ви следва.", "user-started-following-you-dual": "%1 и %2 започнаха да Ви следват.", @@ -75,6 +75,7 @@ "email-confirmed": "Е-пощата беше потвърдена", "email-confirmed-message": "Благодарим Ви, че потвърдихте е-пощата си. Акаунтът Ви е вече напълно активиран.", "email-confirm-error-message": "Възникна проблем при потвърждаването на е-пощата Ви. Може кодът да е грешен или давността му да е изтекла.", + "email-confirm-error-message-already-validated": "Адресът на е-пощата Ви вече е проверен.", "email-confirm-sent": "Изпратено е е-писмо за потвърждение.", "none": "Нищо", "notification-only": "Само известие", diff --git a/public/language/bg/post-queue.json b/public/language/bg/post-queue.json index de0b0f22a4..8634dc6d99 100644 --- a/public/language/bg/post-queue.json +++ b/public/language/bg/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Премахване на избраните", "remove-selected-confirm": "Наистина ли искате да премахнете избраните %1 публикации?", "bulk-accept-success": "Одобрени публикации: %1", - "bulk-reject-success": "Отхвърлени публикации: %1" + "bulk-reject-success": "Отхвърлени публикации: %1", + "links-in-this-post": "Връзки в тази публикация" } \ No newline at end of file diff --git a/public/language/bg/themes/harmony.json b/public/language/bg/themes/harmony.json index cb21cadb9e..27e0c320e1 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": "Показване на пътечката в страниците с категории и теми", + "settings.enableBreadcrumbs.why": "Пътечката се вижда на повечето страници за по-лесно навигиране. Основният дизайн на страниците с категории и теми предоставя други начини за връщане към по-общите страници, но ако желаете, може да изключите показването на пътечката, за да няма претрупване.", "settings.centerHeaderElements": "Центриране на заглавните елементи", "settings.mobileTopicTeasers": "Показване на резюмета на темите на мобилни устройства", "settings.stickyToolbar": "Статична лента с инструменти", diff --git a/public/language/bg/user.json b/public/language/bg/user.json index e7b3229bad..e83af03504 100644 --- a/public/language/bg/user.json +++ b/public/language/bg/user.json @@ -78,6 +78,7 @@ "change-password": "Промяна на паролата", "change-password-error": "Грешна парола!", "change-password-error-wrong-current": "Текущата Ви парола е грешна!", + "change-password-error-same-password": "Новата Ви парола съвпада с текущата. Моля, използвайте нова парола.", "change-password-error-match": "Паролите са различни!", "change-password-error-privileges": "Нямате права да промените тази парола.", "change-password-success": "Паролата ви е обновена!", diff --git a/public/language/bg/users.json b/public/language/bg/users.json index a716af22d4..31e48cdd91 100644 --- a/public/language/bg/users.json +++ b/public/language/bg/users.json @@ -1,5 +1,6 @@ { "all-users": "Всички потребители", + "followed-users": "Следвани потребители", "latest-users": "Последни потребители", "top-posters": "С най-много публикации", "most-reputation": "С най-много репутация", diff --git a/public/language/bn/admin/development/info.json b/public/language/bn/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/bn/admin/development/info.json +++ b/public/language/bn/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/bn/admin/extend/widgets.json b/public/language/bn/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/bn/admin/extend/widgets.json +++ b/public/language/bn/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/bn/admin/settings/reputation.json b/public/language/bn/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/bn/admin/settings/reputation.json +++ b/public/language/bn/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/bn/error.json b/public/language/bn/error.json index 1095290a86..25bbbb804d 100644 --- a/public/language/bn/error.json +++ b/public/language/bn/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).", "cant-chat-with-yourself": "আপনি নিজের সাথে চ্যাট করতে পারবেন না!", "chat-restricted": "এই সদস্য তার বার্তালাপ সংরক্ষিত রেখেছেন। এই সদস্য আপনাকে ফলো করার পরই কেবলমাত্র আপনি তার সাথে চ্যাট করতে পারবেন", + "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/bn/modules.json b/public/language/bn/modules.json index 68ba8f6743..b9a4c311c8 100644 --- a/public/language/bn/modules.json +++ b/public/language/bn/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chat with", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/bn/notifications.json b/public/language/bn/notifications.json index c40359bca7..fb7ca8696c 100644 --- a/public/language/bn/notifications.json +++ b/public/language/bn/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 has posted a new topic: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 আপনাকে অনুসরন করা শুরু করেছেন।", "user-started-following-you-dual": "%1 and %2 started following you.", @@ -75,6 +75,7 @@ "email-confirmed": "ইমেইল নিশ্চিত করা হয়েছে", "email-confirmed-message": "আপনার ইমেইল যাচাই করার জন্য আপনাকে ধন্যবাদ। আপনার অ্যাকাউন্টটি এখন সম্পূর্ণরূপে সক্রিয়।", "email-confirm-error-message": "আপনার ইমেল ঠিকানার বৈধতা যাচাইয়ে একটি সমস্যা হয়েছে। সম্ভবত কোডটি ভুল ছিল অথবা কোডের মেয়াদ শেষ হয়ে গিয়েছে।", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "নিশ্চিতকরণ ইমেইল পাঠানো হয়েছে।", "none": "None", "notification-only": "Notification Only", diff --git a/public/language/bn/post-queue.json b/public/language/bn/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/bn/post-queue.json +++ b/public/language/bn/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/bn/user.json b/public/language/bn/user.json index 3498f5c101..3d9427e2bb 100644 --- a/public/language/bn/user.json +++ b/public/language/bn/user.json @@ -78,6 +78,7 @@ "change-password": "পাসওয়ার্ড পরিবর্তন", "change-password-error": "অগ্রহনযোগ্য পাসওয়ার্ড", "change-password-error-wrong-current": "আপনার পাসওয়ার্ড সঠিক নয়", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "পাসওয়ার্ড অবশ্যই একই হতে হবে", "change-password-error-privileges": "আপনার পাসওয়ার্ড পরিবর্তন করার অনুমতি নেই", "change-password-success": "আপনার পাসওয়ার্ড আপডেট করা হয়েছে", diff --git a/public/language/bn/users.json b/public/language/bn/users.json index faca07fbbb..e7fc7d9a94 100644 --- a/public/language/bn/users.json +++ b/public/language/bn/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "সর্বশেষ নিবন্ধিত সদস্যরা:", "top-posters": "সর্বোচ্চ পোষ্টকারী", "most-reputation": "সর্বোচ্চ সম্মাননাধারী", diff --git a/public/language/cs/admin/development/info.json b/public/language/cs/admin/development/info.json index c47e061cb2..19fb830e9d 100644 --- a/public/language/cs/admin/development/info.json +++ b/public/language/cs/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 vazeb odpovědělo během %2ms.", "host": "host", - "primary": "primární / spuštěné úlohy", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "připojen", @@ -19,6 +19,7 @@ "registered": "Registrován", "sockets": "Sockety", + "connection-count": "Connection Count", "guests": "Hosté", "info": "Informace" diff --git a/public/language/cs/admin/extend/widgets.json b/public/language/cs/admin/extend/widgets.json index a90d25c403..5298775419 100644 --- a/public/language/cs/admin/extend/widgets.json +++ b/public/language/cs/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Upozornění", "alert.confirm-delete": "Jste si jist/a, že chcete smazat tuto miniaplikaci?", diff --git a/public/language/cs/admin/settings/reputation.json b/public/language/cs/admin/settings/reputation.json index c982a8ac2b..42e9bae172 100644 --- a/public/language/cs/admin/settings/reputation.json +++ b/public/language/cs/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Nastavení reputace", "disable": "Zakázat systém reputace", "disable-down-voting": "Zakázat hlasování", - "votes-are-public": "Všechna hlasování jsou veřejná", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Omezení aktivity", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/cs/error.json b/public/language/cs/error.json index 9f61d1907b..d6d6e2244e 100644 --- a/public/language/cs/error.json +++ b/public/language/cs/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Omlouváme se, ale \"O mně\" nesmí být delší než %1 znaků.", "cant-chat-with-yourself": "Nemůžete konverzovat sami se sebou.", "chat-restricted": "Tento uživatel má omezené konverzační zprávy. Nejdříve vás musí začít sledovat, než začnete spolu konverzovat", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Konverzační systém zakázán", "too-many-messages": "Odeslal/a jste příliš mnoho zpráv, vyčkejte chvíli.", "invalid-chat-message": "Neplatná konverzační zpráva", diff --git a/public/language/cs/modules.json b/public/language/cs/modules.json index 8449a1a15e..a0e8d950b0 100644 --- a/public/language/cs/modules.json +++ b/public/language/cs/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Konverzace s", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json index dc1f11eaf7..49c8e9c597 100644 --- a/public/language/cs/notifications.json +++ b/public/language/cs/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 založil nové téma: %2", "user-edited-post": "Příspěvek %2 byl upraven uživatelem %1", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 vás začal sledovat.", "user-started-following-you-dual": "%1 a %2 vás začali sledovat.", @@ -75,6 +75,7 @@ "email-confirmed": "E-mail potvrzen", "email-confirmed-message": "Děkujeme za ověření vaší e-mailové adresy. Váš účet je nyní aktivní.", "email-confirm-error-message": "Nastal problém s ověřením vaší e-mailové adresy. Kód je pravděpodobně neplatný nebo jeho platnost vypršela.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Ověřovací e-mail odeslán.", "none": "Nic", "notification-only": "Jen oznámení", diff --git a/public/language/cs/post-queue.json b/public/language/cs/post-queue.json index 8212df7563..e3e410fb22 100644 --- a/public/language/cs/post-queue.json +++ b/public/language/cs/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/cs/user.json b/public/language/cs/user.json index d2d2e04ea9..2594e8b411 100644 --- a/public/language/cs/user.json +++ b/public/language/cs/user.json @@ -78,6 +78,7 @@ "change-password": "Změnit heslo", "change-password-error": "Neplatné heslo.", "change-password-error-wrong-current": "Aktuální heslo není správně.", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Hesla se neshodují.", "change-password-error-privileges": "Nemáte oprávnění změnit heslo.", "change-password-success": "Heslo bylo aktualizováno.", diff --git a/public/language/cs/users.json b/public/language/cs/users.json index 5947554536..195ee52f14 100644 --- a/public/language/cs/users.json +++ b/public/language/cs/users.json @@ -1,5 +1,6 @@ { "all-users": "Všichni uživatelé", + "followed-users": "Followed Users", "latest-users": "Nejnovější uživatelé", "top-posters": "Nejaktivnější", "most-reputation": "Nejváženější", diff --git a/public/language/da/admin/development/info.json b/public/language/da/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/da/admin/development/info.json +++ b/public/language/da/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/da/admin/extend/widgets.json b/public/language/da/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/da/admin/extend/widgets.json +++ b/public/language/da/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/da/admin/settings/reputation.json b/public/language/da/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/da/admin/settings/reputation.json +++ b/public/language/da/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/da/error.json b/public/language/da/error.json index e333c37eb1..ff4ca22969 100644 --- a/public/language/da/error.json +++ b/public/language/da/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Beklager, men din om mig side kan ikke være længere end %1 karakter(er).", "cant-chat-with-yourself": "Du kan ikke chatte med dig selv!", "chat-restricted": "Denne bruger har spæret adgangen til chat beskeder. Brugeren må følge dig før du kan chatte med ham/hende", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Chat system er deaktiveret", "too-many-messages": "Du har sendt for mange beskeder, vent venligt lidt.", "invalid-chat-message": "Ugyldig chat besked", diff --git a/public/language/da/modules.json b/public/language/da/modules.json index d8fc415351..0e034f464c 100644 --- a/public/language/da/modules.json +++ b/public/language/da/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chat with", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/da/notifications.json b/public/language/da/notifications.json index 68a591ebdd..71f11432b5 100644 --- a/public/language/da/notifications.json +++ b/public/language/da/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 har oprettet en ny tråd: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 har valgt at følge dig.", "user-started-following-you-dual": "%1 og %2 har valgt at følge dig.", @@ -75,6 +75,7 @@ "email-confirmed": "Email bekræftet", "email-confirmed-message": "Tak fordi du validerede din email. Din konto er nu fuldt ud aktiveret.", "email-confirm-error-message": "Der var et problem med valideringen af din emailadresse. Bekræftelses koden var muligvis forkert eller udløbet.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Bekræftelses email afsendt.", "none": "None", "notification-only": "Notification Only", diff --git a/public/language/da/post-queue.json b/public/language/da/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/da/post-queue.json +++ b/public/language/da/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/da/user.json b/public/language/da/user.json index c60d54fbba..859b326a98 100644 --- a/public/language/da/user.json +++ b/public/language/da/user.json @@ -78,6 +78,7 @@ "change-password": "Skift kodeord", "change-password-error": "Ukorrekt kodeord", "change-password-error-wrong-current": "Nuværende kodeord er ikke korrekt", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Passwords matcher ikke!", "change-password-error-privileges": "Du har ikke rettigheder til at ændre dette password.", "change-password-success": "Dit password er opdateret!", diff --git a/public/language/da/users.json b/public/language/da/users.json index c753726891..633884794e 100644 --- a/public/language/da/users.json +++ b/public/language/da/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Seneste brugere", "top-posters": "Top Postere", "most-reputation": "Mest Omdømme", diff --git a/public/language/de/admin/development/info.json b/public/language/de/admin/development/info.json index 082f1b212c..75e634b208 100644 --- a/public/language/de/admin/development/info.json +++ b/public/language/de/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP%1", "nodes-responded": "%1 Knoten antworteten innerhalb von %2ms", "host": "Host", - "primary": "Primärer / Laufjob", + "primary": "primary / jobs", "pid": "PID", "nodejs": "Node.js Version", "online": "Online", @@ -19,6 +19,7 @@ "registered": "Registriert", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Gäste", "info": "Info" diff --git a/public/language/de/admin/extend/widgets.json b/public/language/de/admin/extend/widgets.json index 73e7853806..37dbf4208f 100644 --- a/public/language/de/admin/extend/widgets.json +++ b/public/language/de/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Karte", "container.card-header": "Karten-Kopfzeile", "container.card-body": "Karten-Körper", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alarm", "alert.confirm-delete": "Möchtest Du dieses Widget wirklich löschen?", diff --git a/public/language/de/admin/settings/reputation.json b/public/language/de/admin/settings/reputation.json index 96c048a963..5ee4aca389 100644 --- a/public/language/de/admin/settings/reputation.json +++ b/public/language/de/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Ansehenseinstellungen", "disable": "Ansehenssystem deaktivieren", "disable-down-voting": "Negative Bewertungen deaktivieren", - "votes-are-public": "Alle Bewertungen sind öffentlich", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Aktivitätsschwelle", "min-rep-upvote": "Mindestreputation, um Beiträge hochzustimmen", "upvotes-per-day": "Upvotes pro Tag (für unbegrenzte Upvotes auf 0 setzen)", diff --git a/public/language/de/error.json b/public/language/de/error.json index ca2b4ad316..4b3bbcdd34 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Entschuldigung, dein \"über mich\" kann nicht länger als %1 Zeichen sein.", "cant-chat-with-yourself": "Du kannst nicht mit dir selber chatten!", "chat-restricted": "Dieser Benutzer hat seine Chatfunktion eingeschränkt. Du kannst nur mit diesem Benutzer chatten, wenn er dir folgt.", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Das Chatsystem deaktiviert", "too-many-messages": "Du hast zu viele Nachrichten versandt, bitte warte eine Weile.", "invalid-chat-message": "Ungültige Nachricht", diff --git a/public/language/de/modules.json b/public/language/de/modules.json index 80d6560e7d..07223c8d94 100644 --- a/public/language/de/modules.json +++ b/public/language/de/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Raum %1", "chat.chatting-with": "Chatte mit", - "chat.placeholder": "Gebe hier eine Chatnachricht ein, ziehe Bilder per Drag & Drop und drücke die Eingabetaste, um sie zu senden", - "chat.placeholder.mobile": "Hier Chatnachricht eingeben", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Zur neuesten Nachricht gehen", "chat.usernames-and-x-others": "%1 & %2 andere", "chat.chat-with-usernames": "Chatte mit %1", diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json index 6c26f60728..983cfc0f9d 100644 --- a/public/language/de/notifications.json +++ b/public/language/de/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 und %3 andere haben geantwortet auf: %4", "user-posted-topic": "%1 hat ein neues Thema erstellt: %2", "user-edited-post": "%1 hat einen Post in %2 bearbeitet", - "user-posted-topic-with-tag": "%1 hat ein neues Thema mit dem Tag %2 erstellt", - "user-posted-topic-with-tag-dual": "%1 hat ein neues Thema mit den Tags %2 and %3 erstellt", - "user-posted-topic-with-tag-triple": "%1 hat ein neues Thema mit den Tags %2, %3 und %4 erstellt", - "user-posted-topic-with-tag-multiple": "%1 hat ein neues Thema mit den Tags %2 erstellt", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 hat ein neues Thema in %2 erstellt", "user-started-following-you": "%1 folgt dir jetzt.", "user-started-following-you-dual": "%1 und %2 folgen dir jetzt.", @@ -75,6 +75,7 @@ "email-confirmed": "E-Mail bestätigt", "email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.", "email-confirm-error-message": "Es gab ein Problem bei der Validierung Ihrer E-Mail-Adresse. Möglicherweise ist der Code ungültig oder abgelaufen.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Bestätigungs-E-Mail gesendet.", "none": "Nichts", "notification-only": "Nur Benachrichtigungen", diff --git a/public/language/de/post-queue.json b/public/language/de/post-queue.json index 2ace5c3d6f..a5ba8448c4 100644 --- a/public/language/de/post-queue.json +++ b/public/language/de/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Ausgewählte entfernen", "remove-selected-confirm": "Möchtest Du %1 ausgewählte Beiträge entfernen?", "bulk-accept-success": "%1 Beiträge akzeptiert", - "bulk-reject-success": "%1 Beiträge abgelehnt" + "bulk-reject-success": "%1 Beiträge abgelehnt", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/de/user.json b/public/language/de/user.json index 86be2c274f..5024d4211c 100644 --- a/public/language/de/user.json +++ b/public/language/de/user.json @@ -78,6 +78,7 @@ "change-password": "Passwort ändern", "change-password-error": "Ungültiges Passwort!", "change-password-error-wrong-current": "Ihr derzeitiges Passwort ist ungültig!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Passwörter müssen übereinstimmen!", "change-password-error-privileges": "Deine Berechtigungen reichen nicht aus, um dieses Passwort zu ändern.", "change-password-success": "Ihr Passwort wurde aktualisiert!", diff --git a/public/language/de/users.json b/public/language/de/users.json index bd842c76f4..2793cb50f9 100644 --- a/public/language/de/users.json +++ b/public/language/de/users.json @@ -1,5 +1,6 @@ { "all-users": "Alle Benutzer", + "followed-users": "Followed Users", "latest-users": "Neuste Benutzer", "top-posters": "Meiste Beiträge", "most-reputation": "Höchstes Ansehen", diff --git a/public/language/el/admin/development/info.json b/public/language/el/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/el/admin/development/info.json +++ b/public/language/el/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/el/admin/extend/widgets.json b/public/language/el/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/el/admin/extend/widgets.json +++ b/public/language/el/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/el/admin/settings/reputation.json b/public/language/el/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/el/admin/settings/reputation.json +++ b/public/language/el/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/el/error.json b/public/language/el/error.json index 610b497364..76c215d00c 100644 --- a/public/language/el/error.json +++ b/public/language/el/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).", "cant-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/el/modules.json b/public/language/el/modules.json index 3bc454ffdc..62eeb01bc4 100644 --- a/public/language/el/modules.json +++ b/public/language/el/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chat with", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/el/notifications.json b/public/language/el/notifications.json index 8043fa57da..609c4830af 100644 --- a/public/language/el/notifications.json +++ b/public/language/el/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 has posted a new topic: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 started following you.", "user-started-following-you-dual": "%1 and %2 started following you.", @@ -75,6 +75,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": "Στάλθηκε email επιβεβαίωσης.", "none": "None", "notification-only": "Notification Only", diff --git a/public/language/el/post-queue.json b/public/language/el/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/el/post-queue.json +++ b/public/language/el/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/el/user.json b/public/language/el/user.json index 07f3fb63ac..e236310aca 100644 --- a/public/language/el/user.json +++ b/public/language/el/user.json @@ -78,6 +78,7 @@ "change-password": "Αλλαγή Κωδικού", "change-password-error": "Άκυρος Κωδικός!", "change-password-error-wrong-current": "Ο τωρινός σου κωδικός δεν είναι σωστός!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Οι κωδικοί πρέπει να είναι οι ίδιοι!", "change-password-error-privileges": "Δεν έχεις δικαιώματα για να αλλάξεις αυτόν τον κωδικό.", "change-password-success": "Ο κωδικός σου ανανεώθηκε!", diff --git a/public/language/el/users.json b/public/language/el/users.json index 2688ff4ae2..962f274993 100644 --- a/public/language/el/users.json +++ b/public/language/el/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Πρόσφατοι Χρήστες", "top-posters": "Top Δημοσιεύοντες", "most-reputation": "Υψηλότερη Φήμη", diff --git a/public/language/en-GB/admin/extend/widgets.json b/public/language/en-GB/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/en-GB/admin/extend/widgets.json +++ b/public/language/en-GB/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/en-GB/error.json b/public/language/en-GB/error.json index d849187bae..c8d52acb6e 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/modules.json b/public/language/en-GB/modules.json index 36731fe37f..3e332287d4 100644 --- a/public/language/en-GB/modules.json +++ b/public/language/en-GB/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chat with", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/en-GB/notifications.json b/public/language/en-GB/notifications.json index 2782fdaff9..a359aed941 100644 --- a/public/language/en-GB/notifications.json +++ b/public/language/en-GB/notifications.json @@ -57,10 +57,10 @@ "user-posted-topic": "%1 has posted a new topic: %2", "user-edited-post" : "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", @@ -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 b010898322..73bce4498a 100644 --- a/public/language/en-GB/user.json +++ b/public/language/en-GB/user.json @@ -81,6 +81,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-GB/users.json b/public/language/en-GB/users.json index 9e29aecf63..ac1faf4a09 100644 --- a/public/language/en-GB/users.json +++ b/public/language/en-GB/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Latest Users", "top-posters": "Top Posters", "most-reputation": "Most Reputation", diff --git a/public/language/en-US/admin/development/info.json b/public/language/en-US/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/en-US/admin/development/info.json +++ b/public/language/en-US/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/en-US/admin/extend/widgets.json b/public/language/en-US/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/en-US/admin/extend/widgets.json +++ b/public/language/en-US/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/en-US/admin/settings/reputation.json b/public/language/en-US/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/en-US/admin/settings/reputation.json +++ b/public/language/en-US/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/en-US/error.json b/public/language/en-US/error.json index f12e15c94f..674f9bec8b 100644 --- a/public/language/en-US/error.json +++ b/public/language/en-US/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).", "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-US/modules.json b/public/language/en-US/modules.json index 3bc454ffdc..62eeb01bc4 100644 --- a/public/language/en-US/modules.json +++ b/public/language/en-US/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chat with", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/en-US/notifications.json b/public/language/en-US/notifications.json index 02125c4009..989025a566 100644 --- a/public/language/en-US/notifications.json +++ b/public/language/en-US/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 has posted a new topic: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 started following you.", "user-started-following-you-dual": "%1 and %2 started following you.", @@ -75,6 +75,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", "notification-only": "Notification Only", diff --git a/public/language/en-US/post-queue.json b/public/language/en-US/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/en-US/post-queue.json +++ b/public/language/en-US/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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-US/user.json b/public/language/en-US/user.json index 8fba89a9de..51386c048f 100644 --- a/public/language/en-US/user.json +++ b/public/language/en-US/user.json @@ -78,6 +78,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/users.json b/public/language/en-US/users.json index 18882fa619..ab6dd9154a 100644 --- a/public/language/en-US/users.json +++ b/public/language/en-US/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Latest Users", "top-posters": "Top Posters", "most-reputation": "Most Reputation", diff --git a/public/language/en-x-pirate/admin/development/info.json b/public/language/en-x-pirate/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/en-x-pirate/admin/development/info.json +++ b/public/language/en-x-pirate/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/en-x-pirate/admin/extend/widgets.json b/public/language/en-x-pirate/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/en-x-pirate/admin/extend/widgets.json +++ b/public/language/en-x-pirate/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/en-x-pirate/admin/settings/reputation.json b/public/language/en-x-pirate/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/en-x-pirate/admin/settings/reputation.json +++ b/public/language/en-x-pirate/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/en-x-pirate/error.json b/public/language/en-x-pirate/error.json index f12e15c94f..674f9bec8b 100644 --- a/public/language/en-x-pirate/error.json +++ b/public/language/en-x-pirate/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).", "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-x-pirate/modules.json b/public/language/en-x-pirate/modules.json index a9cf4d3ed8..6e180967fb 100644 --- a/public/language/en-x-pirate/modules.json +++ b/public/language/en-x-pirate/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chat with", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/en-x-pirate/notifications.json b/public/language/en-x-pirate/notifications.json index 975f837cd7..98358f593f 100644 --- a/public/language/en-x-pirate/notifications.json +++ b/public/language/en-x-pirate/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 has posted a new topic: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 started following you.", "user-started-following-you-dual": "%1 and %2 started following you.", @@ -75,6 +75,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", "notification-only": "Notification Only", diff --git a/public/language/en-x-pirate/post-queue.json b/public/language/en-x-pirate/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/en-x-pirate/post-queue.json +++ b/public/language/en-x-pirate/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/en-x-pirate/user.json b/public/language/en-x-pirate/user.json index 8653a1e096..58dcb69f71 100644 --- a/public/language/en-x-pirate/user.json +++ b/public/language/en-x-pirate/user.json @@ -78,6 +78,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-x-pirate/users.json b/public/language/en-x-pirate/users.json index 435f4d2652..2da0f54540 100644 --- a/public/language/en-x-pirate/users.json +++ b/public/language/en-x-pirate/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Land lubbers", "top-posters": "Top mateys", "most-reputation": "Most Reputation", diff --git a/public/language/es/admin/admin.json b/public/language/es/admin/admin.json index e869a52da7..9e1c619891 100644 --- a/public/language/es/admin/admin.json +++ b/public/language/es/admin/admin.json @@ -1,5 +1,5 @@ { - "alert.confirm-rebuild-and-restart": "¿Está seguro que desea reconstruir y reiniciar NodeBB?", + "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?", "alert.confirm-restart": "¿Está seguro que desea reiniciar NodeBB?", "acp-title": "%1 | Panel de control de administrador NodeBB", diff --git a/public/language/es/admin/development/info.json b/public/language/es/admin/development/info.json index 5f934d3a40..6f37b0c1e8 100644 --- a/public/language/es/admin/development/info.json +++ b/public/language/es/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "¡%1 nodos respondieron en %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "en-linea", @@ -19,6 +19,7 @@ "registered": "Registrado", "sockets": "Toma", + "connection-count": "Connection Count", "guests": "Invitados", "info": "Información" diff --git a/public/language/es/admin/extend/widgets.json b/public/language/es/admin/extend/widgets.json index 02774f78f3..c3833836a4 100644 --- a/public/language/es/admin/extend/widgets.json +++ b/public/language/es/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alerta (alert)", "alert.confirm-delete": "Estás seguro/a de que deseas borrar este widget?", diff --git a/public/language/es/admin/settings/reputation.json b/public/language/es/admin/settings/reputation.json index f327695a35..f9eae15643 100644 --- a/public/language/es/admin/settings/reputation.json +++ b/public/language/es/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Configuración de Reputación", "disable": "Desactivar Sistema de Reputación", "disable-down-voting": "Desactivar Votos Negativos", - "votes-are-public": "Todos los Votos son Públicos", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Umbrales de Actividad", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/es/error.json b/public/language/es/error.json index c9a2e457d9..eaf6c6d3d4 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Lo sentimos, pero tu descripción no puede ser más larga de %1 caractere(s).", "cant-chat-with-yourself": "¡No puedes conversar contigo mismo!", "chat-restricted": "Este usuario tiene restringidos los mensajes de chat. Los usuarios deben seguirte antes de que pueda charlar con ellos", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "El sistema de chat está deshabilitado", "too-many-messages": "Has enviado demasiados mensajes, por favor espera un poco.", "invalid-chat-message": "Mensaje de Chat inválido", diff --git a/public/language/es/modules.json b/public/language/es/modules.json index 3d907c74ed..884a5353fa 100644 --- a/public/language/es/modules.json +++ b/public/language/es/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chatear con", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json index 16d514cb9c..18c6160c26 100644 --- a/public/language/es/notifications.json +++ b/public/language/es/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 ha publicado un nuevo tema: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 comenzó a seguirte.", "user-started-following-you-dual": "%1 y %2 comenzaron a seguirte.", @@ -75,6 +75,7 @@ "email-confirmed": "Correo electrónico confirmado", "email-confirmed-message": "Gracias por validar tu correo electrónico. Tu cuenta ya está completamente activa.", "email-confirm-error-message": "Hubo un problema al validar tu cuenta de correo electrónico. Quizá el código era erróneo o expiró...", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Correo de confirmación enviado.", "none": "Ninguno/a", "notification-only": "Solo Notificación", diff --git a/public/language/es/post-queue.json b/public/language/es/post-queue.json index 4005bfcbb4..d440fc983f 100644 --- a/public/language/es/post-queue.json +++ b/public/language/es/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file diff --git a/public/language/es/rewards.json b/public/language/es/rewards.json index f923cf1500..57578aca4a 100644 --- a/public/language/es/rewards.json +++ b/public/language/es/rewards.json @@ -1,5 +1,5 @@ { - "awarded-x-reputation": "You have been awarded %1 reputation", + "awarded-x-reputation": "Has sido premiado", "awarded-group-membership": "You have been added to the group %1", "essentials/user.reputation-conditional-value": "(Reputation %1 %2)", 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/es/user.json b/public/language/es/user.json index de0d5f59c2..de49651aa5 100644 --- a/public/language/es/user.json +++ b/public/language/es/user.json @@ -78,6 +78,7 @@ "change-password": "Cambiar contraseña", "change-password-error": "¡Contraseña no válida!", "change-password-error-wrong-current": "¡Su contraseña actual no es correcta!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "¡Las contraseñas deben coincidir!", "change-password-error-privileges": "No tienes los permisos suficientes para cambiar esta contraseña.", "change-password-success": "¡Tu contraseña ha sido actualizada!", diff --git a/public/language/es/users.json b/public/language/es/users.json index b5e67ca5dc..3fe8b73df1 100644 --- a/public/language/es/users.json +++ b/public/language/es/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Últimos usuarios", "top-posters": "Top por mensajes", "most-reputation": "Más reputados", diff --git a/public/language/et/admin/admin.json b/public/language/et/admin/admin.json index 1e904fd12e..8446c26e4e 100644 --- a/public/language/et/admin/admin.json +++ b/public/language/et/admin/admin.json @@ -4,15 +4,15 @@ "acp-title": "%1 | NodeBB Administraatori kontrollpaneel", "settings-header-contents": "Sisu", - "changes-saved": "Changes Saved", + "changes-saved": "Muudatused salvestatud", "changes-saved-message": "Your changes to the NodeBB configuration have been saved.", "changes-not-saved": "Changes Not Saved", - "changes-not-saved-message": "NodeBB encountered a problem saving your changes. (%1)", - "save-changes": "Save changes", + "changes-not-saved-message": "NodeBB-l tekkis probleem su muudatuste salvestamisel. (%1)", + "save-changes": "Salvesta muudatused", "min": "Min:", "max": "Max:", - "view": "View", - "edit": "Edit", - "add": "Add", - "select-icon": "Select Icon" + "view": "Vaata", + "edit": "Muuda", + "add": "Lisa", + "select-icon": "Vali ikoon" } \ No newline at end of file diff --git a/public/language/et/admin/development/info.json b/public/language/et/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/et/admin/development/info.json +++ b/public/language/et/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/et/admin/extend/widgets.json b/public/language/et/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/et/admin/extend/widgets.json +++ b/public/language/et/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/et/admin/settings/reputation.json b/public/language/et/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/et/admin/settings/reputation.json +++ b/public/language/et/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/et/error.json b/public/language/et/error.json index bed991b6c9..9f4f6a5bec 100644 --- a/public/language/et/error.json +++ b/public/language/et/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Vabandage, teie tutvustus ei saa olaa pikem kui %1 tähemärk(i).", "cant-chat-with-yourself": "Sa ei saa endaga vestelda!", "chat-restricted": "Kasutaja on piiranud sõnumite saatmist. Privaatsõnumi saatmiseks peab kasutaja sind jälgima", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Vestlus süsteem keelatud", "too-many-messages": "Oled saatnud liiga palju sõnumeid, oota natukene.", "invalid-chat-message": "Vigane vestluse sõnum", diff --git a/public/language/et/modules.json b/public/language/et/modules.json index 539eecc169..d66b6d7bf0 100644 --- a/public/language/et/modules.json +++ b/public/language/et/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chat with", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/et/notifications.json b/public/language/et/notifications.json index a4dd123e07..6717703992 100644 --- a/public/language/et/notifications.json +++ b/public/language/et/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 on postitanud uue teema: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 hakkas sind jälgima.", "user-started-following-you-dual": "%1 ja %2 hakkasid sind jälgima.", @@ -75,6 +75,7 @@ "email-confirmed": "Emaili aadress kinnitatud", "email-confirmed-message": "Täname, et kinnitasite oma emaili aadressi. Teie kasutaja on nüüd täielikult aktiveeritud.", "email-confirm-error-message": "Emaili aadressi kinnitamisel tekkis viga. Võibolla kinnituskood oli vale või aegunud.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Kinnituskiri on saadetud.", "none": "None", "notification-only": "Notification Only", diff --git a/public/language/et/post-queue.json b/public/language/et/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/et/post-queue.json +++ b/public/language/et/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/et/uploads.json b/public/language/et/uploads.json index d4f7bbcca4..63f2828fde 100644 --- a/public/language/et/uploads.json +++ b/public/language/et/uploads.json @@ -1,7 +1,7 @@ { "uploading-file": "Laen faili üles...", "select-file-to-upload": "Vali fail mida üles laadida!", - "upload-success": "Fail üles laetud edukalt!", + "upload-success": "Fail edukalt üles laetud!", "maximum-file-size": "Maksimaalselt %1 kb", "no-uploads-found": "No uploads found", "public-uploads-info": "Uploads are public, all visitors can see them.", diff --git a/public/language/et/user.json b/public/language/et/user.json index dc531559d9..1571b708d7 100644 --- a/public/language/et/user.json +++ b/public/language/et/user.json @@ -78,6 +78,7 @@ "change-password": "Vaheta parooli", "change-password-error": "Vigane parool!", "change-password-error-wrong-current": "Su praegune parool on vale!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Paroolid peavad kattuma!", "change-password-error-privileges": "Sul ei ole piisavalt õigusi, et vahetada seda parooli.", "change-password-success": "Sinu parool on uuendatud!", diff --git a/public/language/et/users.json b/public/language/et/users.json index 88cc5df4fa..2716eab76e 100644 --- a/public/language/et/users.json +++ b/public/language/et/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Hilised kasutajad", "top-posters": "Top postitajad", "most-reputation": "Kõige rohkem reputatsiooni", diff --git a/public/language/fa-IR/admin/admin.json b/public/language/fa-IR/admin/admin.json index 34435717b6..ebf14c7704 100644 --- a/public/language/fa-IR/admin/admin.json +++ b/public/language/fa-IR/admin/admin.json @@ -4,15 +4,15 @@ "acp-title": "%1 | کنترل پنل مدیر کل نود‌بی‌بی", "settings-header-contents": "محتوا", - "changes-saved": "Changes Saved", - "changes-saved-message": "Your changes to the NodeBB configuration have been saved.", + "changes-saved": "تغییرات ذخیره شد", + "changes-saved-message": "تغییرات شما در پیکربندی NodeBB ذخیره شده است.", "changes-not-saved": "تغییرات ذخیره نشد", - "changes-not-saved-message": "NodeBB encountered a problem saving your changes. (%1)", - "save-changes": "Save changes", - "min": "Min:", - "max": "Max:", - "view": "View", - "edit": "Edit", - "add": "Add", - "select-icon": "Select Icon" + "changes-not-saved-message": "NodeBB در ذخیره تغییرات شما با مشکل مواجه شد. (% 1)", + "save-changes": "ذخیره تغییرات", + "min": "کمترین:", + "max": "بیشترین:", + "view": "نمایش", + "edit": "ویرایش", + "add": "اضافه", + "select-icon": "انتخاب نقشک" } \ No newline at end of file diff --git a/public/language/fa-IR/admin/advanced/cache.json b/public/language/fa-IR/admin/advanced/cache.json index b0aa10e284..498b0ea71e 100644 --- a/public/language/fa-IR/admin/advanced/cache.json +++ b/public/language/fa-IR/admin/advanced/cache.json @@ -1,10 +1,10 @@ { - "cache": "Cache", - "post-cache": "کش دیدگاه ", - "group-cache": "Group Cache", - "local-cache": "Local Cache", - "object-cache": "Object Cache", + "cache": "نهانگاه", + "post-cache": "نهانگاه دیدگاه ", + "group-cache": "نهانگاه گروه", + "local-cache": "نهانگاه محلی", + "object-cache": "شئ نهانگاه", "percent-full": "%1% تمام شده", - "post-cache-size": "سایز کش دیدگاه", - "items-in-cache": "موارد موجود در کش" + "post-cache-size": "اندازه نهانگاه فرسته", + "items-in-cache": "موارد موجود در نهانگاه" } \ No newline at end of file diff --git a/public/language/fa-IR/admin/advanced/database.json b/public/language/fa-IR/admin/advanced/database.json index 7d609b872c..da700c60ae 100644 --- a/public/language/fa-IR/admin/advanced/database.json +++ b/public/language/fa-IR/admin/advanced/database.json @@ -2,51 +2,51 @@ "x-b": "%1 b", "x-mb": "%1 mb", "x-gb": "%1 gb", - "uptime-seconds": "آپتایم در ثانیه", - "uptime-days": "آپتایم در روز", + "uptime-seconds": "زمان به‌کار در ثانیه", + "uptime-days": "زمان به‌کار در روز", "mongo": "MongoDB", - "mongo.version": "ورژن پایگاه داده مونگو دیبی", - "mongo.storage-engine": "سیستم ذخیره سازی", + "mongo.version": "نگارش پایگاه داده MongoDB", + "mongo.storage-engine": "سامانه ذخیره سازی", "mongo.collections": "مجموعه ها", "mongo.objects": "اشیا ", - "mongo.avg-object-size": "میانگین سایز اشیا", - "mongo.data-size": "سایز اطلاعات", + "mongo.avg-object-size": "میانگین اندازه اشیا", + "mongo.data-size": "انداره اطلاعات", "mongo.storage-size": "اندازه محل ذخیره سازی", "mongo.index-size": "اندازه شاخص", - "mongo.file-size": "اندازه فایل", + "mongo.file-size": "اندازه پرونده", "mongo.resident-memory": "حافظه مقیم", "mongo.virtual-memory": "حافظۀ مجازی", - "mongo.mapped-memory": "Mapped Memory", + "mongo.mapped-memory": "حافظه نقشه شده", "mongo.bytes-in": "بایت های ورودی", "mongo.bytes-out": "بایت های خروجی", "mongo.num-requests": "تعداد درخواست ها", - "mongo.raw-info": "اطلاعات پایه پایگاه داده مونگو دی بی", - "mongo.unauthorized": "NodeBB نتوانست پرس و جوی آماری را از مونگو دی بی دریافت کند لطفا مطمئن شوید کاربر که NodeBB به وسیله آن به مونگو دیبی متصل شده است مجوز clusterMonitor را برای مدیر داشته باشد", + "mongo.raw-info": "اطلاعات پایه پایگاه داده MongoDB", + "mongo.unauthorized": "NodeBB نتوانست پرس و جوی آماری را ازMongoDB دریافت کند. لطفا مطمئن شوید کاربری که NodeBB به وسیله آن به MongoDB متصل شده است مجوز clusterMonitor را برای مدیر داشته باشد.", - "redis": "ردیس", - "redis.version": "ورژن ردیس", + "redis": "Redis", + "redis.version": "نگارش Redis", "redis.keys": "کلید ها", "redis.expires": "انقضا", "redis.avg-ttl": "میانگین TTL", - "redis.connected-clients": "کلاینت های متصل شده", + "redis.connected-clients": "کارخواه های متصل شده", "redis.connected-slaves": "Connected Slaves", - "redis.blocked-clients": "Blocked Clients", - "redis.used-memory": "Used Memory", + "redis.blocked-clients": "کارخواه های مسدود شده", + "redis.used-memory": "حافظه‌ی درحال استفاده", "redis.memory-frag-ratio": "Memory Fragmentation Ratio", - "redis.total-connections-recieved": "Total Connections Received", - "redis.total-commands-processed": "Total Commands Processed", - "redis.iops": "Instantaneous Ops. Per Second", - "redis.iinput": "Instantaneous Input Per Second", - "redis.ioutput": "Instantaneous Output Per Second", - "redis.total-input": "Total Input", - "redis.total-output": "Total Ouput", + "redis.total-connections-recieved": "کل اتصالات دریافت شده", + "redis.total-commands-processed": "کل دستورات پردازش شده", + "redis.iops": "عملیات در ثانیه", + "redis.iinput": "ورودی در ثانیه", + "redis.ioutput": "خروجی در ثانیه", + "redis.total-input": "کل ورودی‌ها", + "redis.total-output": "کل خروجی‌ها", "redis.keyspace-hits": "Keyspace Hits", "redis.keyspace-misses": "Keyspace Misses", - "redis.raw-info": "Redis Raw Info", + "redis.raw-info": "اطلاعات خام Redis", - "postgres": "Postgres", - "postgres.version": "PostgreSQL Version", - "postgres.raw-info": "Postgres Raw Info" + "postgres": "PostgreSQL", + "postgres.version": "نگارش PostgreSQL", + "postgres.raw-info": "اطلاعات خام PostgreSQL" } diff --git a/public/language/fa-IR/admin/advanced/errors.json b/public/language/fa-IR/admin/advanced/errors.json index cd1e4793d8..54fa86fa3e 100644 --- a/public/language/fa-IR/admin/advanced/errors.json +++ b/public/language/fa-IR/admin/advanced/errors.json @@ -1,15 +1,15 @@ { - "errors": "Errors", + "errors": "خطاها", "figure-x": "Figure %1", - "error-events-per-day": "%1 events per day", - "error.404": "ارور 404 یافت نشد", - "error.503": "ارور 503 سرویس دردسترس نیست", - "manage-error-log": "مدیریت Error Log", - "export-error-log": "Export Error Log (CSV)", - "clear-error-log": "پاک کردن Error Log", + "error-events-per-day": "%1 رویداد ها در روز", + "error.404": "خطای 404 یافت نشد", + "error.503": "خطای 503 سرویس دردسترس نیست", + "manage-error-log": "مدیریت گذارش خطاها", + "export-error-log": "خروجی گرفتن از گذارش خطاها با قالب csv", + "clear-error-log": "پاک کردن گذارش خطاها", "route": "مسیر", "count": "شمارش", - "no-routes-not-found": "ایول! بدون ارور 404 !", - "clear404-confirm": "آیا از پاک کردن ارور های 404 اطمینان دارید؟", - "clear404-success": "ارور های 404 پاک شدند" + "no-routes-not-found": "ایول! بدون خطای 404!", + "clear404-confirm": "آیا از پاک کردن خطا های 404 اطمینان دارید؟", + "clear404-success": "\"خطای های 404\" پاک شدند" } \ No newline at end of file diff --git a/public/language/fa-IR/admin/advanced/events.json b/public/language/fa-IR/admin/advanced/events.json index f2488c1306..df1381ab28 100644 --- a/public/language/fa-IR/admin/advanced/events.json +++ b/public/language/fa-IR/admin/advanced/events.json @@ -2,16 +2,16 @@ "events": "رویداد ها", "no-events": "رویدادی موجود نیست", "control-panel": "کنترل پنل رویداد ها", - "delete-events": "Delete Events", - "confirm-delete-all-events": "Are you sure you want to delete all logged events?", - "filters": "Filters", - "filters-apply": "Apply Filters", - "filter-type": "Event Type", - "filter-start": "Start Date", - "filter-end": "End Date", - "filter-user": "Filter by User", - "filter-user.placeholder": "Type user name to filter...", - "filter-group": "Filter by Group", - "filter-group.placeholder": "Type group name to filter...", - "filter-per-page": "Per Page" + "delete-events": "حذف رویداد ها", + "confirm-delete-all-events": "آیا مطمئن هستید که می خواهید همه رویدادهای ثبت شده را حذف کنید؟", + "filters": "پالایه ها", + "filters-apply": "اعمال پالایه ها", + "filter-type": "نوع رویداد", + "filter-start": "زمان شروع", + "filter-end": "تاریخ پایان", + "filter-user": "پالایه کردن بر اساس کاربر", + "filter-user.placeholder": "نام کاربری را برای پالایه کردن کاربر بنویسید...", + "filter-group": "پالایه کردن بر اساس گروه", + "filter-group.placeholder": "نام گروه را برای پالایه کردن بنویسید...", + "filter-per-page": "در صفحه" } \ No newline at end of file diff --git a/public/language/fa-IR/admin/advanced/logs.json b/public/language/fa-IR/admin/advanced/logs.json index 37846be559..8fe83cc30d 100644 --- a/public/language/fa-IR/admin/advanced/logs.json +++ b/public/language/fa-IR/admin/advanced/logs.json @@ -1,6 +1,6 @@ { "logs": "گزارشات", - "control-panel": "کنترل پنل گزارشات", + "control-panel": "فرمانگاه گزارشات", "reload": "بارگزاری مجدد گزارش ها", "clear": "حذف گزارشات", "clear-success": "گزارش ها پاک شدند" diff --git a/public/language/fa-IR/admin/appearance/customise.json b/public/language/fa-IR/admin/appearance/customise.json index 4495400030..344ce38b45 100644 --- a/public/language/fa-IR/admin/appearance/customise.json +++ b/public/language/fa-IR/admin/appearance/customise.json @@ -1,20 +1,20 @@ { - "customise": "Customise", - "custom-css": "Custom CSS/SASS", - "custom-css.description": "Enter your own CSS/SASS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS/SASS", + "customise": "سفارشی‌سازی", + "custom-css": "CSS/SASS سفارشی", + "custom-css.description": "اعلان‌های CSS/SASS خود را در اینجا وارد کنید، که بعد از همه‌ی استایل‌های دیگر اعمال خواهند شد.", + "custom-css.enable": "فعال‌سازی CSS/SASS سفارشی", "custom-js": "جائا اسکریپت سفارشی", - "custom-js.description": "کد های جاوا اسکریپت خود را در این قسمت وارد کنید بعد از لود شدن تمام صفحه اجرا خواهند شد", - "custom-js.enable": "به کارگیری جاوا اسکریپت سفارشی ", + "custom-js.description": "کد های جاوا اسکریپت خود را در این قسمت وارد کنید که بعد از بارگزاری تمام صفحه اجرا خواهند شد.", + "custom-js.enable": "به‌کارگیری جاوا اسکریپت سفارشی ", "custom-header": "هدر سفارشی", - "custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <head> section of your forum's markup. Script tags are allowed, but are discouraged, as the Custom Javascript tab is available.", - "custom-header.enable": "Enable Custom Header", + "custom-header.description": "HTML سفارشی را در اینجا وارد کنید (مثلاً متا تگ ها و غیره)، که به <head> بخش نشانه گذاری انجمن شما برچسب‌های اسکریپت مجاز هستند، اما از آنجایی که برگه جاوا اسکریپت سفارشی در دسترس است، توصیه نمی‌شود.", + "custom-header.enable": "به‌کارگیری هدر سفارشی", - "custom-css.livereload": "Enable Live Reload", - "custom-css.livereload.description": "Enable this to force all sessions on every device under your account to refresh whenever you click save", + "custom-css.livereload": "به‌کارگیری بارگزاری مجدد زنده", + "custom-css.livereload.description": "این را فعال کنید تا هر زمان که روی ذخیره کلیک می‌کنید، تمام جلسات در هر دستگاهی که در حساب شما قرار دارد مجبور به باز‌آوری شوند", "bsvariables": "_variables.scss", - "bsvariables.description": "Override bootstrap variables here. You can also use a tool like bootstrap.build and paste the output here.
Changes require a rebuild & restart.", - "bsvariables.enable": "Enable _variables.scss" + "bsvariables.description": "در اینجا متغیرهای راه‌اندازی را لغو کنید. همچنین می توانید از ابزاری مانند bootstrap.build استفاده کنید و خروجی را در اینجا بچسبانید.
تغییرات نیاز به بازسازی و راه اندازی مجدد دارند.", + "bsvariables.enable": "به‌کارگیری _variables.scss" } \ No newline at end of file diff --git a/public/language/fa-IR/admin/appearance/skins.json b/public/language/fa-IR/admin/appearance/skins.json index c98482f27b..a9f7b40def 100644 --- a/public/language/fa-IR/admin/appearance/skins.json +++ b/public/language/fa-IR/admin/appearance/skins.json @@ -1,18 +1,18 @@ { - "skins": "Skins", + "skins": "پوسته‌ها", "bootswatch-skins": "Bootswatch Skins", - "custom-skins": "Custom Skins", - "add-skin": "Add Skin", - "save-custom-skins": "Save Custom Skins", - "save-custom-skins-success": "Custom skins saved successfully", - "custom-skin-name": "Custom Skin Name", - "custom-skin-variables": "Custom Skin Variables", - "loading": "Loading Skins...", - "homepage": "Homepage", - "select-skin": "Select Skin", - "revert-skin": "Revert Skin", - "current-skin": "Current Skin", - "skin-updated": "Skin Updated", - "applied-success": "%1 skin was succesfully applied", - "revert-success": "Skin reverted to base colours" + "custom-skins": "پوسته‌های سفارشی", + "add-skin": "افزودن پوسته", + "save-custom-skins": "ذخیره پوسته‌های سفارشی", + "save-custom-skins-success": "پوسته‌های سفارشی با موفقیت ذخیره شدند", + "custom-skin-name": "نام پوسته‌ی سفارشی", + "custom-skin-variables": "متغیرهای سفارشی پوسته", + "loading": "بارگزاری پوسته‌ها", + "homepage": "صفحه خانه", + "select-skin": "انتخاب پوسته", + "revert-skin": "بازگردانی پوسته", + "current-skin": "پوسته‌ی جاری", + "skin-updated": "پوسته‌های بروزشده", + "applied-success": "% 1 پوسته با موفقیت اعمال شد", + "revert-success": "پوسته به رنگ های پایه بارگردانی شد" } \ No newline at end of file diff --git a/public/language/fa-IR/admin/appearance/themes.json b/public/language/fa-IR/admin/appearance/themes.json index a6b65e46f3..4f2db7b657 100644 --- a/public/language/fa-IR/admin/appearance/themes.json +++ b/public/language/fa-IR/admin/appearance/themes.json @@ -1,13 +1,13 @@ { - "themes": "Themes", - "checking-for-installed": "Checking for installed themes...", - "homepage": "Homepage", - "select-theme": "Select Theme", - "revert-theme": "Revert Theme", - "current-theme": "Current Theme", - "no-themes": "No installed themes found", - "revert-confirm": "Are you sure you wish to restore the default NodeBB theme?", - "theme-changed": "Theme Changed", - "revert-success": "You have successfully reverted your NodeBB back to it's default theme.", - "restart-to-activate": "Please rebuild and restart your NodeBB to fully activate this theme." + "themes": "زمینه‌ها", + "checking-for-installed": "در حال بررسی ژمینه‌های نصب شده...", + "homepage": "صفحه‌ی خانه", + "select-theme": "گزینش زمینه", + "revert-theme": "بازگردانی زمینه", + "current-theme": "زمینه‌ی جاری", + "no-themes": "هیچ زمینه‌ی نصب شده ای یافت نشد", + "revert-confirm": "آیا مطمئن هستید که می خواهید زمینه‌ی پیش فرض NodeBB را بازیابی کنید؟", + "theme-changed": "زمینه تغییر کرد", + "revert-success": "NodeBB خود را با موفقیت به زمینه‌ی پیش فرض آن برگرداندید.", + "restart-to-activate": "لطفاً NodeBB خود را دوباره بسازید و مجدداً راه اندازی کنید تا این زمینه به طور کامل فعال شود." } \ No newline at end of file diff --git a/public/language/fa-IR/admin/dashboard.json b/public/language/fa-IR/admin/dashboard.json index e79db14d13..77ff6d56e8 100644 --- a/public/language/fa-IR/admin/dashboard.json +++ b/public/language/fa-IR/admin/dashboard.json @@ -1,43 +1,43 @@ { - "forum-traffic": "Forum Traffic", - "page-views": "Page Views", - "unique-visitors": "Unique Visitors", - "logins": "Logins", - "new-users": "New Users", - "posts": "Posts", + "forum-traffic": "شد‌‌آمد انجمن", + "page-views": "بازدید از صفحه", + "unique-visitors": "بازدیدکنندگان منحصر به فرد", + "logins": "ورودها", + "new-users": "کاربران جدید", + "posts": "فرسته‌ها", "topics": "موضوع‌ها", - "page-views-seven": "Last 7 Days", - "page-views-thirty": "Last 30 Days", - "page-views-last-day": "Last 24 hours", - "page-views-custom": "Custom Date Range", - "page-views-custom-start": "Range Start", - "page-views-custom-end": "Range End", - "page-views-custom-help": "Enter a date range of page views you would like to view. If no date picker is available, the accepted format is YYYY-MM-DD", - "page-views-custom-error": "Please enter a valid date range in the format YYYY-MM-DD", + "page-views-seven": "هفت روز آخر", + "page-views-thirty": "۳۰ روز آخر", + "page-views-last-day": "۲۴ ساعت آخر", + "page-views-custom": "محدوده‌ی تاریخ سفارشی", + "page-views-custom-start": "شروع محدوده", + "page-views-custom-end": "پایان محدوده", + "page-views-custom-help": "محدوده تاریخی از بازدیدهای صفحه را که می خواهید مشاهده کنید وارد کنید. اگر انتخابگر تاریخ در دسترس نباشد، قالب پذیرفته شده YYYY-MM-DD است", + "page-views-custom-error": "لطفاً یک محدوده تاریخی معتبر در قالب YYYY-MM-DD وارد کنید", - "stats.yesterday": "Yesterday", - "stats.today": "Today", - "stats.last-week": "Last Week", - "stats.this-week": "This Week", - "stats.last-month": "Last Month", - "stats.this-month": "This Month", - "stats.all": "همیشه", + "stats.yesterday": "دیروز", + "stats.today": "امروز", + "stats.last-week": "آخرین هفته", + "stats.this-week": "این هفته", + "stats.last-month": "آخرین ماه", + "stats.this-month": "این ماه", + "stats.all": "همه‌ی زمان‌ها", - "updates": "Updates", - "running-version": "You are running NodeBB v%1.", - "keep-updated": "Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.", - "up-to-date": "You are up-to-date ", - "upgrade-available": "A new version (v%1) has been released. Consider upgrading your NodeBB.", - "prerelease-upgrade-available": "This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider upgrading your NodeBB.", - "prerelease-warning": "This is a pre-release version of NodeBB. Unintended bugs may occur. ", - "fallback-emailer-not-found": "Fallback emailer not found!", - "running-in-development": "Forum is running in development mode. The forum may be open to potential vulnerabilities; please contact your system administrator", - "latest-lookup-failed": "Failed to look up latest available version of NodeBB", + "updates": "بروزرسانی‌ها", + "running-version": "شما در حال اجراء NodeBB v 1% هستید.", + "keep-updated": "برای آخرین وصله های امنیتی و رفع باگ ها همیشه مطمئن شوید که NodeBB شما به روز است.", + "up-to-date": "شما بروز هستید", + "upgrade-available": "نسخه جدید (v%1) منتشر شده است. ارتقا NodeBB خود را در نظر بگیرید.", + "prerelease-upgrade-available": "این یک نسخه پیش از انتشار قدیمی NodeBB است. نسخه جدید (v%1) منتشر شده است. ارتقا NodeBB خود را در نظر بگیرید. ", + "prerelease-warning": "این یک نسخه پیش از انتشار NodeBB است. ممکن است اشکالات ناخواسته رخ دهد.", + "fallback-emailer-not-found": "ایمیل بازگشتی پیدا نشد!", + "running-in-development": "انجمن در حالت توسعه (development mode) در حال اجرا است. انجمن ممکن است برای اسیب پذیری های بالقوه باز باشد؛ لطفا با مدیر سیستم خود تماس بگیرید", + "latest-lookup-failed": "جستجو در اخرین نسخه موجود NodeBB شکست خورد", - "notices": "Notices", - "restart-not-required": "Restart not required", - "restart-required": "Restart required", - "search-plugin-installed": "Search Plugin installed", + "notices": "اطلاعیه ها", + "restart-not-required": "راه اندازی مجدد لازم نیست", + "restart-required": "راه‌اندازی مجدد لازم است", + "search-plugin-installed": "افزونه جستجو نصب شد", "search-plugin-not-installed": "Search Plugin not installed", "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", @@ -74,28 +74,28 @@ "graphs.page-views": "Page Views", "graphs.page-views-registered": "Page Views Registered", "graphs.page-views-guest": "Page Views Guest", - "graphs.page-views-bot": "Page Views Bot", - "graphs.unique-visitors": "Unique Visitors", - "graphs.registered-users": "Registered Users", - "graphs.guest-users": "Guest Users", - "last-restarted-by": "Last restarted by", - "no-users-browsing": "No users browsing", + "graphs.page-views-bot": "ربات بازدید از صفحه", + "graphs.unique-visitors": "بازدیدکنندگان منحصر به فرد", + "graphs.registered-users": "کاربران ثبت نام شده", + "graphs.guest-users": "کاربران مهمان", + "last-restarted-by": "آخرین راه‌اندازی توسط", + "no-users-browsing": "هیچ کاربری در حال مرور نیست", - "back-to-dashboard": "Back to Dashboard", - "details.no-users": "No users have joined within the selected timeframe", - "details.no-topics": "No topics have been posted within the selected timeframe", - "details.no-searches": "No searches have been made within the selected timeframe", - "details.no-logins": "No logins have been recorded within the selected timeframe", - "details.logins-static": "NodeBB only saves session data for %1 days, and so this table below will only show the most recently active sessions", - "details.logins-login-time": "Login Time", - "start": "Start", - "end": "End", - "filter": "Filter", - "view-as-json": "View as JSON", + "back-to-dashboard": "بازگشت به پیش‌خوان", + "details.no-users": "هیچ کاربر جدیدی در بازه زمانی انتخابی عضو نشده است", + "details.no-topics": "هیچ موضوعی در بازه زمانی انتخاب شده ارسال نشده است", + "details.no-searches": "هیچ جستجویی در بازه زمانی انتخاب شده انجام نشده است", + "details.no-logins": "هیچ ورودی در بازه زمانی انتخاب شده ثبت نشده است", + "details.logins-static": "NodeBB فقط داده‌های جلسه را برای %1 روز ذخیره می‌کند، بنابراین این جدول زیر فقط آخرین جلسات فعال را نشان می‌دهد", + "details.logins-login-time": "زمان ورود", + "start": "شروع", + "end": "پایان", + "filter": "فیلتر کردن", + "view-as-json": "نمایش با JSON", "expand-analytics": "Expand analytics", - "clear-search-history": "Clear Search History", - "clear-search-history-confirm": "Are you sure you want to clear entire search history?", - "search-term": "Term", - "search-count": "Count", - "view-all": "View all" + "clear-search-history": "پاک کردن تاریخچه‌ی جستوجو", + "clear-search-history-confirm": "آیا مطمئن هستید که می خواهید کل سابقه جستجو را پاک کنید؟", + "search-term": "مدت", + "search-count": "تعداد", + "view-all": "نمایش همه" } diff --git a/public/language/fa-IR/admin/development/info.json b/public/language/fa-IR/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/fa-IR/admin/development/info.json +++ b/public/language/fa-IR/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/fa-IR/admin/extend/widgets.json b/public/language/fa-IR/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/fa-IR/admin/extend/widgets.json +++ b/public/language/fa-IR/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/fa-IR/admin/settings/reputation.json b/public/language/fa-IR/admin/settings/reputation.json index 7e6aabd62d..b0f1df3986 100644 --- a/public/language/fa-IR/admin/settings/reputation.json +++ b/public/language/fa-IR/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/fa-IR/category.json b/public/language/fa-IR/category.json index e6d045ecb1..43f9d76a01 100644 --- a/public/language/fa-IR/category.json +++ b/public/language/fa-IR/category.json @@ -3,24 +3,24 @@ "subcategories": "زیر دسته‌بندی‌", "new-topic-button": "موضوع تازه", "guest-login-post": "برای ارسال پست وارد شوید", - "no-topics": "هیچ پستی در این دسته‌بندی نیست.
چرا شما یکی نمی‌فرستید؟", + "no-topics": "هیچ فرسته‌ای در این دسته‌بندی نیست.
چرا شما یکی نمی‌فرستید؟", "browsing": "بیننده‌ها", "no-replies": "هیچ کسی پاسخ نداده است.", - "no-new-posts": "هیچ پست جدیدی وجود ندارد.", + "no-new-posts": "هیچ فرسته‌ی جدیدی وجود ندارد.", "watch": "پیگیری", "ignore": "نادیده گرفتن", "watching": "درحال پیگیری", - "tracking": "Tracking", - "not-watching": "درحال پیگیری نیستید", + "tracking": "پیگیری کردن", + "not-watching": "مشاهده نکردن", "ignoring": "در حال نادیده گرفتن", - "watching.description": "Notify me of new topics.
Show topics in unread & recent", - "tracking.description": "Shows topics in unread & recent", - "not-watching.description": "موضوع ها را در بخش نخوانده ها نمایش نده و در بخش تازه ها نشان بده", - "ignoring.description": "Do not show topics in unread & recent", - "watching.message": "اکنون شما به‌روزرسانی‌های این دسته و تمام زیر دسته‌هایش را پیگیری می‌کنید", - "tracking.message": "You are now tracking updates from this category and all subcategories", - "notwatching.message": "اکنون شما به‌روزرسانی‌های این دسته و همه‌ی زیر دسته‌هایش را پیگیری نمی کنید", - "ignoring.message": "اکنون شما به‌روزرسانی‌های این دسته و همه‌ی زیر دسته‌هایش را نادیده گرفته‌اید", + "watching.description": "موضوعات جدید را به من اطلاع بده.
موضوعات خوانده نشده و اخیر را نشان بده", + "tracking.description": "موضوعات خوانده نشده و اخیر را نشان می دهد", + "not-watching.description": "موضوع ها را در بخش نخوانده ها نمایش نده و در بخش اخیر نشان بده", + "ignoring.description": "موضوعات خوانده نشده و اخیر نشان داده نشود", + "watching.message": "اکنون شما به‌روزرسانی‌های این دسته‌بندی و تمام زیر دسته‌بندی‌هایش را مشاهده می‌کنید", + "tracking.message": "اکنون به‌روزرسانی‌های این دستهبندی و همه زیر دسته‌بندی هایش را دنبال می‌کنید", + "notwatching.message": "اکنون شما به‌روزرسانی‌های این دسته بندی و همه‌ی زیر دسته بندی‌هایش را پیگیری نمی کنید", + "ignoring.message": "اکنون شما به‌روزرسانی‌های این دسته‌بندی و همه‌ی زیر دسته‌بندی‌هایش را نادیده گرفته‌اید", "watched-categories": "دسته بندی های پیگیری شده", - "x-more-categories": "1% دسته‌های بیشتر" + "x-more-categories": "1% دسته‌بندی‌های بیشتر" } \ No newline at end of file diff --git a/public/language/fa-IR/error.json b/public/language/fa-IR/error.json index a5f9e4cd17..3034e90088 100644 --- a/public/language/fa-IR/error.json +++ b/public/language/fa-IR/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "با عرض پوزش محتوای 'درباره ی من' نمی تواند طولانی تر از %1 کاراکتر باشد", "cant-chat-with-yourself": "شما نمی‌توانید با خودتان چت کنید!", "chat-restricted": "این کاربر پیام های چتی خود را محدود کرده است . آنها بایدشما را دنبال کنند تا اینکه شما بتوانید به آنها پیامی بفرستید", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "سیستم گفتمان غیرفعال شده است", "too-many-messages": "شما پیامهای خیلی زیادی فرستاده اید، لطفا مدتی صبر نمایید", "invalid-chat-message": "پیام نامعتبر", diff --git a/public/language/fa-IR/login.json b/public/language/fa-IR/login.json index 750e6ac7fd..0398fe9644 100644 --- a/public/language/fa-IR/login.json +++ b/public/language/fa-IR/login.json @@ -3,7 +3,7 @@ "username": "نام کاربری", "remember-me": "مرا به یاد بسپار؟", "forgot-password": "رمز عبور را فراموش کرده‌اید؟", - "alternative-logins": "روش‌های ثبت نام جایگزین", + "alternative-logins": "روش‌های ثبت‌نام جایگزین", "failed-login-attempt": "ورود ناموفق", "login-successful": "شما با موفقیت وارد شده‌اید!", "dont-have-account": "حساب کاربری ندارید؟", diff --git a/public/language/fa-IR/modules.json b/public/language/fa-IR/modules.json index 0086b8f2f0..8f1097ea51 100644 --- a/public/language/fa-IR/modules.json +++ b/public/language/fa-IR/modules.json @@ -1,8 +1,9 @@ { - "chat.room-id": "Room %1", - "chat.chatting-with": "چت با", - "chat.placeholder": "پیام چت را اینجا بنویس، عکس‌ها را اینجا درگ و دراپ کن، برای ارسال دکمه Enter را بزن", - "chat.placeholder.mobile": "پیام چت را اینجا بنویس", + "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.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "چت با %1", diff --git a/public/language/fa-IR/notifications.json b/public/language/fa-IR/notifications.json index 012fd6cbd2..0e4c38c39f 100644 --- a/public/language/fa-IR/notifications.json +++ b/public/language/fa-IR/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 یک موضوع جدید ارسال کرده: %2", "user-edited-post": "%1 پستی را در %2 ویرایش کرد", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 شروع به دنبال کردن شما کرده", "user-started-following-you-dual": "%1 و %2 شروع به دنبال کردن شما کرده.", @@ -75,6 +75,7 @@ "email-confirmed": "ایمیل تایید شد", "email-confirmed-message": "بابت تایید ایمیلتان سپاس‌گزاریم. حساب کاربری شما اکنون به صورت کامل فعال شده است.", "email-confirm-error-message": "خطایی در تایید آدرس ایمیل شما پیش آمده است. ممکن است کد نا‌معتبر و یا منقضی شده باشد.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "ایمیل تایید ارسال شد.", "none": "هیچکدام", "notification-only": "فقط اعلان", diff --git a/public/language/fa-IR/post-queue.json b/public/language/fa-IR/post-queue.json index b8c434f0ce..3ce2cdd30c 100644 --- a/public/language/fa-IR/post-queue.json +++ b/public/language/fa-IR/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file diff --git a/public/language/fa-IR/recent.json b/public/language/fa-IR/recent.json index dcf34eb8bd..ffc08fcaf5 100644 --- a/public/language/fa-IR/recent.json +++ b/public/language/fa-IR/recent.json @@ -7,5 +7,5 @@ "alltime": "همه زمانها", "no-recent-topics": "هیچ موضوع تازه‌ای نیست.", "no-popular-topics": "هیچ موضوع پربازدیدی وجود ندارد", - "load-new-posts": "بارگذاری پست‌های جدید" + "load-new-posts": "بارگذاری فرسته‌های جدید" } \ No newline at end of file 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/fa-IR/unread.json b/public/language/fa-IR/unread.json index c457a7eb61..4c2c56e4f2 100644 --- a/public/language/fa-IR/unread.json +++ b/public/language/fa-IR/unread.json @@ -1,16 +1,16 @@ { "title": "نخوانده‌ها", - "no-unread-topics": "جستار خوانده نشده‌ای وجود ندارد.", + "no-unread-topics": "موضوعات خوانده نشده‌ای وجود ندارد.", "load-more": "بارگذاری بیش‌تر", - "mark-as-read": "خوانده شده بگیر", - "mark-as-unread": "Mark as Unread", - "selected": "برگزیده", + "mark-as-read": "علامت زدن به عنوان خوانده شده", + "mark-as-unread": "علامت زدن به‌ عنوان نخوانده شده", + "selected": "انتخاب شده", "all": "همه", - "all-categories": "تمام دسته ها", + "all-categories": "تمام دسته‌بندی‌ها", "topics-marked-as-read.success": "همه موضوع ها خوانده شدند", "all-topics": "همه موضوع ها", "new-topics": "موضوع های جدید", - "watched-topics": "موضوع های پیگیری شده", + "watched-topics": "موضوع های تماشا شده", "unreplied-topics": "موضوع های بدون پاسخ", "multiple-categories-selected": "انتخاب چندگانه" } \ No newline at end of file diff --git a/public/language/fa-IR/uploads.json b/public/language/fa-IR/uploads.json index 9b22c754b9..b17922ff80 100644 --- a/public/language/fa-IR/uploads.json +++ b/public/language/fa-IR/uploads.json @@ -3,7 +3,7 @@ "select-file-to-upload": "فایل مورد نظر را برای بارگذاری انتخاب کنید!", "upload-success": "فایل با موفقیت بارگذاری شد!", "maximum-file-size": "حداکثر %1 کیلوبایت", - "no-uploads-found": "No uploads found", - "public-uploads-info": "آپلود ها عمومی هستند، همه کاربران می توانند آن ها را ببینند.", - "private-uploads-info": "Uploads are private, only logged in users can see them." + "no-uploads-found": "هیچ بارگزاری یافت نشد", + "public-uploads-info": "بارگزاری‌ها عمومی هستند، همه کاربران می توانند آن ها را ببینند.", + "private-uploads-info": "براگزاری‌ها خصوصی هستند، فقط کاربرانی که وارد شده اند می توانند آنها را ببینند." } \ No newline at end of file diff --git a/public/language/fa-IR/user.json b/public/language/fa-IR/user.json index a55866ce70..df67523fab 100644 --- a/public/language/fa-IR/user.json +++ b/public/language/fa-IR/user.json @@ -1,45 +1,45 @@ { - "user-menu": "User menu", + "user-menu": "فهرست کاربری", "banned": "اخراج شده", - "unbanned": "Unbanned", - "muted": "Muted", - "unmuted": "Unmuted", + "unbanned": "رفع مسدود شده", + "muted": "ساکت شده", + "unmuted": "باصدا شده", "offline": "آفلاین", "deleted": "حذف شده", "username": "نام کاربری", "joindate": "تاریخ عضویت", "postcount": "تعداد پست‌ها", "email": "رایانامه", - "confirm-email": "تأیید ایمیل", - "account-info": "اطلاعات شناسه کاربری", + "confirm-email": "تأیید رایانامه", + "account-info": "اطلاعات حساب کاربری", "admin-actions-label": "اقدامات مدیریتی", - "ban-account": "اخراج کاربر", + "ban-account": "مسدود کردن کاربر", "ban-account-confirm": "از مسدود کردن این کاربر اطمینان دارید؟", "unban-account": "آزاد کردن حساب کاربری", - "mute-account": "Mute Account", - "unmute-account": "Unmute Account", - "delete-account": "حذف حساب کاربری", - "delete-account-as-admin": "Delete Account", - "delete-content": "Delete Account Content", - "delete-all": "Delete Account and Content", - "delete-account-confirm": "Are you sure you want to anonymize your posts and delete your account?
This action is irreversible and you will not be able to recover any of your data

Enter your password to confirm that you wish to destroy this account.", - "delete-this-account-confirm": "Are you sure you want to delete this account while leaving its contents behind?
This action is irreversible, posts will be anonymized, and you will not be able to restore post associations with the deleted account

", - "delete-account-content-confirm": "Are you sure you want to delete this account's content (posts/topics/uploads)?
This action is irreversible and you will not be able to recover any data

", - "delete-all-confirm": "Are you sure you want to delete this account and all of its content (posts/topics/uploads)?
This action is irreversible and you will not be able to recover any data

", - "account-deleted": "حساب کاربری پاک شد", - "account-content-deleted": "Account content deleted", + "mute-account": "ساکت کردن حساب کاربری", + "unmute-account": "با‌صدا کردن حساب کاربری", + "delete-account": "حذف کردن حساب کاربری", + "delete-account-as-admin": "حذف حساب کاربری", + "delete-content": "حذف محتویات (فرسته‌ها/موضوعات/بارگزاری‌ها) حساب کاربری", + "delete-all": "حذف حساب کاربری و محتویات آن (فرسته‌ها/موضوعات/بارگزاری‌ها)", + "delete-account-confirm": "آیا مطمئن هستید که می خواهید فرسته های خود را ناشناس کنید و حساب خود را حذف کنید؟
این عمل غیر قابل برگشت است و نمی توانید هیچ یک از داده های خود را بازیابی کنید.

رمز عبور خود را وارد کنید تا تأیید کنید که می خواهید این حساب را از بین ببرید.", + "delete-this-account-confirm": "آیا مطمئن هستید که می‌خواهید این حساب را در حالی که محتویات آن را پشت سر گذاشته‌اید حذف کنید؟
این عمل غیرقابل برگشت است، پست‌ها ناشناس می‌شوند و نمی‌توانید ارتباط فرسته‌ها را با حساب حذف شده بازیابی کنید.

", + "delete-account-content-confirm": "آیا مطمئن هستید که می خواهید محتوای این حساب (فرسته‌ها/موضوعات/بارگزاری‌ها) را حذف کنید؟
این عمل غیر قابل برگشت است و شما نمی توانید هیچ داده ای را بازیابی کنید

", + "delete-all-confirm": "آیا مطمئنید که می‌خواهید این حساب و تمام محتوای آن (فرسته‌ها/موضوعات/براگزاری‌ها) را حذف کنید؟
این عمل غیر قابل برگشت است و شما نمی توانید هیچ داده ای را بازیابی کنید

", + "account-deleted": "حساب کاربریِ پاک شده", + "account-content-deleted": "محتویات حساب کاربری پاک شده", "fullname": "نام و نام‌ خانوادگی", "website": "تارنما", "location": "محل سکونت", "age": "سن", "joined": "عضو شده", "lastonline": "آخرین حضور", - "profile": "پروفایل", - "profile-views": "بازدیدهای نمایه", + "profile": "نمایه", + "profile-views": "دفعات بازدید از نمایه", "reputation": "اعتبار", "bookmarks": "نشانک‌ها", "watched-categories": "دسته بندی های پیگیری شده", - "watched-tags": "Watched tags", + "watched-tags": "برچسب های پیگیری شده", "change-all": "تغییر همه", "watched": "موضوع های پیگیری شده", "ignored": "نادیده گرفته شده", @@ -51,37 +51,38 @@ "block-toggle": "مسدود کردن", "block-user": "مسدود کردن کاربر", "unblock-user": "رفع مسدودی کاربر", - "aboutme": "درباره ی من", + "aboutme": "درباره‌ی من", "signature": "امضا", "birthday": "روز تولد", "chat": "چت", - "chat-with": "ادامه چت با %1", - "new-chat-with": "شروع چت جدید با %1", - "flag-profile": "گزارش پروفایل", - "follow": "دنبال کن", - "unfollow": "دنبال نکن", + "chat-with": "ادامه گفتوگو با %1", + "new-chat-with": "شروع گفت‏وگو‌ی جدید با %1", + "flag-profile": "پرچم کردن نمایه", + "follow": "دنبال کردن", + "unfollow": "دنبال نکردن", "more": "بیشتر", - "profile-update-success": "پروفایل باموفقیت به روز شده است!", + "profile-update-success": "نمایه با موفقیت به روز شده است!", "change-picture": "تغییر تصویر", "change-username": "تغییر نام کاربری", - "change-email": "تغییر ایمیل", - "email-updated": "Email Updated", - "email-same-as-password": "Please enter your current password to continue – you've entered your new email again", + "change-email": "تغیر نشانی رایانامه", + "email-updated": "رایانامه بروز شده", + "email-same-as-password": "لطفا رمز عبور فعلی خود را برای ادامه وارد کنید – شما دوباره نشانی رایانامه جدید خود را وارد کرده اید", "edit": "ویرایش", - "edit-profile": "ویرایش پروفایل", - "default-picture": "آیکون پیش فرض", + "edit-profile": "ویرایش نمایه", + "default-picture": "نقشک پیش فرض", "uploaded-picture": "تصویر بارشده", "upload-new-picture": "بارگذاری تصویر تازه", "upload-new-picture-from-url": "بارگذاری تصویر جدید از نشانی وب", - "current-password": "کلمه عبور کنونی", - "new-password": "New Password", - "change-password": "تغیر کلمه عبور", - "change-password-error": "کلمه عبور نامعتبر!", - "change-password-error-wrong-current": "این کلمه عبورٔ شما نادرست است.", - "change-password-error-match": "کلمه عبور‌ها باید یکسان باشند.", - "change-password-error-privileges": "شما اجازه تغییر این کلمه عبور را ندارید.", - "change-password-success": "کلمه عبور‌تان تازه شد.", - "confirm-password": "تکرار کلمه عبور", + "current-password": "گذرواژه کنونی", + "new-password": "گذرواژه جدید", + "change-password": "تغییر گذرواژه", + "change-password-error": "گذرواژه اشتباه است!", + "change-password-error-wrong-current": "گذرواژه شما نادرست است.", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", + "change-password-error-match": "گذارواژه ها باید یکسان باشند.", + "change-password-error-privileges": "شما اجازه تغییر این گذرواژه را ندارید.", + "change-password-success": "گذرواژهتان بروز شد.", + "confirm-password": "تکرار گذرواژه", "password": "گذرواژه", "username-taken-workaround": "نام کاربری که درخواست کردید قبلاً گرفته شده است، بنابراین ما آن را تغییر داده ایم. شما هم‌اکنون با نام %1 شناخته می‌شوید.", "password-same-as-username": "کلمه ی عبور شما با نام کاربری شما یکسان می باشند ، لطفا کلمه ی عبور دیگری را انتخاب کنید", @@ -94,9 +95,9 @@ "remove-cover-picture-confirm": "آیا شما مطمئنید که می خواهید عکس کاور را حذف کنید؟", "crop-picture": "برش عکس", "upload-cropped-picture": "برش و بارگذاری", - "avatar-background-colour": "Avatar background colour", + "avatar-background-colour": "رنگ پس زمینه چهرک", "settings": "تنظیمات", - "show-email": "نمایش ایمیل‌های من", + "show-email": "نمایش نشانی رایانامه من", "show-fullname": "نمایش نام کامل من (نام و نام خانوادگی)", "restrict-chats": "فقط از کاربرانی که دنبال می کنم پیام خصوصی دریافت کنم", "digest-label": "مشترک شدن در چکیده", @@ -104,32 +105,32 @@ "digest-off": "خاموش", "digest-daily": "روزانه", "digest-weekly": "هفتگی", - "digest-biweekly": "Bi-Weekly", + "digest-biweekly": "دو هفته‌ای", "digest-monthly": "ماهانه", "has-no-follower": "این کاربر هیچ دنبال‌کننده‌ای ندارد :(", "follows-no-one": "این کاربر هیچ کسی را دنبال نمی‌کند :(", "has-no-posts": "این کاربر تا به حال هیچ چیزی ارسال نکرده است.", - "has-no-best-posts": "This user does not have any upvoted posts yet.", - "has-no-topics": "این کاربر تا به حال هیچ موضوعی ارسال نکرده است", - "has-no-watched-topics": "این کاربر تا به حال هیچ موضوعی را پیگیری نکرده است", - "has-no-ignored-topics": "این کاربر هیچ موضوعی را نادیده نگرفته است", - "has-no-upvoted-posts": "این کاربر به هیچ پستی امتیاز نداده است.", - "has-no-downvoted-posts": "این کاربر به هیچ پستی رای منفی نداده است.", - "has-no-controversial-posts": "This user does not have any downvoted posts yet.", + "has-no-best-posts": "این کاربر هنوز هیچ فرسته‌ای با رای مثبت ندارد.", + "has-no-topics": "این کاربر تا به حال هیچ موضوعی ارسال نکرده است.", + "has-no-watched-topics": "این کاربر تا به حال هیچ موضوعی را پیگیری نکرده است.", + "has-no-ignored-topics": "این کاربر هیچ موضوعی را نادیده نگرفته است.", + "has-no-upvoted-posts": "این کاربر به هیچ فرسته‌ رای مثبت نداده است.", + "has-no-downvoted-posts": "این کاربر به هیچ فرسته‌ای رای منفی نداده است.", + "has-no-controversial-posts": "این کاربر هنوز هیچ فرسته‌ای با رای منفی ندارد.", "has-no-blocks": "شما هیچ کاربر مسدود شده ای ندارید.", - "email-hidden": "ایمیل پنهان شده", - "hidden": "پنهان", + "email-hidden": "نشانی رایانامه پنهان شده", + "hidden": "پنهان شده", "paginate-description": "صفحه بندی و نمایش موضوع ها و پست‌ها به جای نمایش بر اساس اسکرول موس", "topics-per-page": "شمار موضوع ها در هر برگه", "posts-per-page": "شمار پست‌ها در هر برگه", "category-topic-sort": "مرتب‌ سازی دسته موضوع", - "topic-post-sort": "مرتب سازی پست‌های تاپیک", + "topic-post-sort": "مرتب سازی فرسته‌های موضوع", "max-items-per-page": "حداکثر %1", - "acp-language": "زبان پنل ادمین", - "notifications": "آگاه‌سازی‌ها", + "acp-language": "زبان صفحه مدیریت", + "notifications": "اعلان ها", "upvote-notif-freq": "تنظیمات اعلان امتیاز مثبت", "upvote-notif-freq.all": "همه امتیاز های مثبت", - "upvote-notif-freq.first": "First Per Post", + "upvote-notif-freq.first": "اول در هر فرسته", "upvote-notif-freq.everyTen": "هر ده امتیاز مثبت", "upvote-notif-freq.threshold": "On 1, 5, 10, 25, 50, 100, 150, 200...", "upvote-notif-freq.logarithmic": "هر 10، 10، 1000 ...", @@ -138,85 +139,85 @@ "open-links-in-new-tab": "پیوندهای به بیرون را در برگ جدید باز کن", "enable-topic-searching": "فعال کردن جستجوی درون موضوعی", "topic-search-help": "اگر فعال باشد، \"جستجوی درون موضوعی\" جایگزین قابلیت جستجوی پیشفرض مرورگر خواهد شد و این امکان را خواهید داشت که بجای جستجوی آنچه که در صفحه نمایش می بینید، در سرتاسر موضوع جستجو کنید", - "update-url-with-post-index": "بروزرسانی آدرس پست در مرورگر هنگام گشت و گذار در موضوعات", - "scroll-to-my-post": "پس از ارسال پست، اولین پست جدید نشان بده", + "update-url-with-post-index": "بروزرسانی نشانی فرسته در مرورگر هنگام گشت و گذار در موضوعات", + "scroll-to-my-post": "پس از ارسال فرسته، اولین فرسته‌ی جدید را نشان بده", "follow-topics-you-reply-to": "پیگیری موضوع هایی که شما به آن ها پاسخ دادید", "follow-topics-you-create": "پیگیری موضوع هایی که شما ایجاد کردید", "grouptitle": "عنوان گروه", "group-order-help": "گروهی را انتخاب کرده و با استفاده از پیکان ها ترتیب عنوان ها را جابه‌جا کنید", - "show-group-title": "Show group title", - "hide-group-title": "Hide group title", + "show-group-title": "نمایش عنوان گروه", + "hide-group-title": "پنهان کردن عنوان گروه", "order-group-up": "Order group up", "order-group-down": "Order group down", - "no-group-title": "عنوان گروهی نیست", + "no-group-title": "گروه عنوانی ندارد", "select-skin": "انتخاب یک پوسته", "default": "Default (%1)", - "no-skin": "No Skin", + "no-skin": "بدون پوسته", "select-homepage": "انتخاب صفحه اصلی", "homepage": "صفحه اصلی", - "homepage-description": "یک صفحه را به عنوان خانه انتخاب کنید یا با انتخاب \"هیچکدام\" صفحه‌ی پیش فرض برای شما انتخاب می‌شود.", - "custom-route": "مسیر صفحه‌ی اختصاصی", + "homepage-description": "یک صفحه را به عنوان صفحه اصلی انتخاب کنید یا با انتخاب \"هیچکدام\" صفحه‌ی پیش فرض برای شما انتخاب می‌شود.", + "custom-route": "صفحه‌ی اصلی انتخابی", "custom-route-help": "Enter a route name here, without any preceding slash (e.g. \"recent\" or \"category/2/general-discussion\")", - "sso.title": "Single Sign-on Services", + "sso.title": "خدمات ثبت نام تکی", "sso.associated": "متصل شده به", "sso.not-associated": "اتصال حساب به", "sso.dissociate": "لغو اتصال", - "sso.dissociate-confirm-title": "Confirm Dissociation", + "sso.dissociate-confirm-title": "جدا‌سازی را تایید کنید", "sso.dissociate-confirm": "آیا مطمئنی می خواهی اتصال %1 به حسابت را لغو کنی؟", "info.latest-flags": "آخرین نشانه گذاری‌ها", - "info.profile": "Profile", - "info.post": "Post", - "info.view-flag": "View flag", - "info.reported-by": "Reported by:", + "info.profile": "نمایه", + "info.post": "فرسته", + "info.view-flag": "مشاهده پرچم ها", + "info.reported-by": "گذارش شده توسط:", "info.no-flags": "پست گزارش شده ای یافت نشد", "info.ban-history": "تاریخچه مسدودیت های اخیر", "info.no-ban-history": "این کاربر هرگز مسدود نشده است", "info.banned-until": "مسدود شده تا %1", - "info.banned-expiry": "Expiry", - "info.ban-expired": "Ban expired", + "info.banned-expiry": "انقضا", + "info.ban-expired": "مسدودیت منقضی شد", "info.banned-permanently": "مسدود شده به طور دائم", "info.banned-reason-label": "دلیل", - "info.banned-no-reason": "هیچ دلیلی ارایه نشد.", - "info.mute-history": "Recent Mute History", - "info.no-mute-history": "This user has never been muted", - "info.muted-until": "Muted until %1", - "info.muted-expiry": "Expiry", - "info.muted-no-reason": "No reason given.", + "info.banned-no-reason": "هیچ دلیلی ارایه نشده است.", + "info.mute-history": "تاریخه سکوت های اخیر", + "info.no-mute-history": "این کاربر تا حالا بی‌صدا نشده است.", + "info.muted-until": "ساکت شده تا ۱٪", + "info.muted-expiry": "انقضا", + "info.muted-no-reason": "دلیلی ارائه نشده است.", "info.username-history": "تاریخچه تعویض نام کاربری", - "info.email-history": "تاریخچه تعویض ایمیل", + "info.email-history": "تاریخچه تعویض رایانامه", "info.moderation-note": "یادداشت مدیر", "info.moderation-note.success": "یادداشت مدیر ذخیره شد", "info.moderation-note.add": "افزودن یادداشت", - "sessions.description": "این صفحه به شما امکان می دهد تا همه Session های فعال حساب خود در انجمن را ببینید و در صورت نیاز آن ها را باطل کنید. شما می توانید Session فعلی خود را با خروج از حساب خود باطل کنید.", - "revoke-session": "Revoke Session", + "sessions.description": "این صفحه به شما امکان می دهد تا همه نشست های فعال حساب خود در انجمن را ببینید و در صورت نیاز آن ها را باطل کنید. شما می توانید نشست فعلی خود را با خروج از حساب خود باطل کنید.", + "revoke-session": "لغو نشست", "browser-version-on-platform": "%1 %2 on %3", "consent.title": "Your Rights & Consent", "consent.lead": "این انجمن اطلاعات شخصی شما را جمع‌آوری و پردازش می‌کند", - "consent.intro": "We use this information strictly to personalise your experience in this community, as well as to associate the posts you make to your user account. During the registration step you were asked to provide a username and email address, you can also optionally provide additional information to complete your user profile on this website.

We retain this information for the life of your user account, and you are able to withdraw consent at any time by deleting your account. At any time you may request a copy of your contribution to this website, via your Rights & Consent page.

If you have any questions or concerns, we encourage you to reach out to this forum's administrative team.", - "consent.email-intro": "Occasionally, we may send emails to your registered email address in order to provide updates and/or to notify you of new activity that is pertinent to you. You can customise the frequency of the community digest (including disabling it outright), as well as select which types of notifications to receive via email, via your user settings page.", - "consent.digest-frequency": "Unless explicitly changed in your user settings, this community delivers email digests every %1.", - "consent.digest-off": "Unless explicitly changed in your user settings, this community does not send out email digests", - "consent.received": "You have provided consent for this website to collect and process your information. No additional action is required.", - "consent.not-received": "You have not provided consent for data collection and processing. At any time this website's administration may elect to delete your account in order to become compliant with the General Data Protection Regulation.", - "consent.give": "Give consent", - "consent.right-of-access": "You have the Right of Access", - "consent.right-of-access-description": "You have the right to access any data collected by this website upon request. You can retrieve a copy of this data by clicking the appropriate button below.", - "consent.right-to-rectification": "You have the Right to Rectification", - "consent.right-to-rectification-description": "You have the right to change or update any inaccurate data provided to us. Your profile can be updated by editing your profile, and post content can always be edited. If this is not the case, please contact this site's administrative team.", - "consent.right-to-erasure": "You have the Right to Erasure", - "consent.right-to-erasure-description": "At any time, you are able to revoke your consent to data collection and/or processing by deleting your account. Your individual profile can be deleted, although your posted content will remain. If you wish to delete both your account and your content, please contact the administrative team for this website.", - "consent.right-to-data-portability": "You have the Right to Data Portability", - "consent.right-to-data-portability-description": "You may request from us a machine-readable export of any collected data about you and your account. You can do so by clicking the appropriate button below.", - "consent.export-profile": "Export Profile (.json)", - "consent.export-profile-success": "Exporting profile, you will get a notification when it is complete.", - "consent.export-uploads": "Export Uploaded Content (.zip)", - "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.", - "consent.export-posts": "Export Posts (.csv)", - "consent.export-posts-success": "Exporting posts, you will get a notification when it is complete.", - "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", - "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email you will not be able to recover your account or login with your email.", - "emailUpdate.required": "This field is required.", - "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page.", - "emailUpdate.password-challenge": "Please enter your password in order to verify account ownership.", - "emailUpdate.pending": "Your email address has not yet been confirmed, but an email has been sent out requesting confirmation. If you wish to invalidate that request and send a new confirmation request, please fill in the form below." + "consent.intro": "ما از این اطلاعات صرفاً برای بهبود تجربه شما در این انجمن و همچنین برای مرتبط کردن فرسته هایی که به حساب کاربری خود می‌فرستید استفاده می کنیم. در مرحله ثبت نام از شما خواسته شد که نام کاربری و نشانی رایانامه‌تان را وارد کنید، همچنین می توانید به صورت اختیاری اطلاعات بیشتری برای تکمیل نمایه کاربری خود در این انجمن ارائه دهید.

ما این اطلاعات را تا پایان عمر حساب کاربری شما حفظ می کنیم و شما می توانید رضایت خود را در هر زمان با حذف حساب خود، پس بگیرید.

اگر هرگونه سوال یا مشکلی دارید ما به شما پیشنهاد میکنیم که آن را از مدیریت این انجمن بپرسید.", + "consent.email-intro": "گاهی اوقات، ممکن است به منظور ارائه به‌روزرسانی‌ها و/یا اطلاع‌رسانی از فعالیت‌های جدید مربوط به شما، ایمیل‌هایی به نشانی رایانامه ثبت‌شده شما ارسال شود. می‌توانید تعداد دفعات خلاصه انجمن را سفارشی کنید (از جمله غیرفعال کردن کامل آن)، و همچنین میتوانید انتخاب کنید که چه نوع اعلان‌هایی را از طریق رایانامه‌تان دریافت کنید.", + "consent.digest-frequency": "تنها در زمانی که در تنظیمات کاربر شما تغییر کند، این انجمن خلاصه‌های ایمیل را به صورت %1 ارائه می‌کند.", + "consent.digest-off": "این انجمن خلاصه‌های ایمیل را ارسال نمی‌کند، مگر اینکه به صراحت در تنظیمات کاربر شما این ویژگی فعال شود.", + "consent.received": "شما رضایت‌تان را برای اینکه این انجمن حق جمع آوری و پردازش اطلاعات شما را دارد، اعلام کرده‌اید. هیچ اقدام اضافی مورد نیاز نیست.", + "consent.not-received": "شما رضایت‌تان را برای جمع آوری و پردازش داده ها اعلام نکرده‌اید. در هر زمانی مدیر این انجمن ممکن است تصمیم بگیرد که حساب شما را به منظور مطابقت با مقررات حفاظت از داده های عمومی حذف کند.", + "consent.give": "اعلام داشتن رضایت", + "consent.right-of-access": "شما حق دسترسی را دارید.", + "consent.right-of-access-description": "شما حق دسترسی به اطلاعات جمع آوری شده توسط این انجمن را در صورت درخواست دارید. شما می توانید یک رونوشت از این داده ها را با کلیک کردن روی دکمه مناسب زیر داشته باشید.", + "consent.right-to-rectification": "شما حق تصحیح دارید", + "consent.right-to-rectification-description": "شما حق دارید هرگونه داده نادرست ارائه شده به ما را تغییر دهید یا به روز کنید. اطلاعات نمایه را می توان با بخش \"ویرایش نمایه\" تغیر داد و فرسته ها همیشه قابل ویرایشند. اگر اینطور نیست، لطفاً با تیم مدیریت این انجمن تماس بگیرید.", + "consent.right-to-erasure": "شما حق پاک کردن را دارید", + "consent.right-to-erasure-description": "در هر زمان، می‌توانید با حذف حساب خود، رضایت خود را برای جمع‌آوری و/یا پردازش داده‌ها لغو کنید. نمایه فردی شما قابل حذف است، اگرچه محتوای حساب شما (فرسته‌ها/موضوعات/بارگزاری‌ها) باقی خواهد ماند. اگر می خواهید هم حساب کاربری و هم محتوای حساب خود را حذف کنید، لطفاً با تیم مدیریت این انجمن تماس بگیرید.", + "consent.right-to-data-portability": "شما حق انتقال داده ها را دارید", + "consent.right-to-data-portability-description": "می‌توانید از ما درخواست کنید که اطلاعات جمع‌آوری‌شده درباره شما و حسابتان را با قابلیت خواندن ماشین خروجی بگیریم. شما می توانید این کار را با کلیک بر روی دکمه مربوطه در زیر انجام دهید.", + "consent.export-profile": "خروجی گرفتن از اطلاعات نمایه با قالب json", + "consent.export-profile-success": "در حال خروجی گرفتن اطلاعات نمایه، پس از تکمیل آن یک اعلان دریافت خواهید کرد.", + "consent.export-uploads": "خروجی گرفتن از پرونده های بارگزاری شده با قالب zip", + "consent.export-uploads-success": "در حال خروجی گرفتن بارگزاری‌ها، پس از تکمیل آن یک اعلان دریافت خواهید کرد.", + "consent.export-posts": "خروجی گرفتن از فرسته‌ها با قالب csv", + "consent.export-posts-success": "در حال خروجی گرفتن فرسته‌ها، پس از تکمیل آن یک اعلان دریافت خواهید کرد.", + "emailUpdate.intro": "لطفا نشانی رایانامه خود را در زیر وارد کنید. این انجمن از رایانامه شما برای اعلان ها و همچنین برای بازیابی حساب در صورت گم شدن رمز عبور استفاده می کند.", + "emailUpdate.optional": "این بخش اختیاری است. شما موظف به ارائه نشانی رایانامه خود نیستید، اما بدون رایانامه معتبر نمی توانید حساب خود را بازیابی کنید یا با نشانی رایانامه خود وارد شوید.", + "emailUpdate.required": "پر کردن این بخش الزامی است.", + "emailUpdate.change-instructions": "یک ایمیل تایید با یک پیوند منحصر به فرد به نشانی رایانامه وارد شده ارسال می شود. دسترسی به آن پیوند مالکیت شما را بر نشانی رایانامه‌تان تایید می کند و نشانی رایانامه جدید شما در حساب شما فعال می شود. در هر زمان، می‌توانید نشانی رایانامه‌تان را از صفحه \"ویرایش نمایه\" عوض کنید.", + "emailUpdate.password-challenge": "لطفاً رمز عبور خود را برای تأیید مالکیت حساب وارد کنید.", + "emailUpdate.pending": "نشانی رایانامه شما هنوز تایید نشده است، اما ایمیلی برای درخواست تایید ارسال شده است. اگر می خواهید آن درخواست را باطل کنید و یک درخواست تأیید دیگر دریافت کنید، لطفاً بخش زیر را پر کنید." } \ No newline at end of file diff --git a/public/language/fa-IR/users.json b/public/language/fa-IR/users.json index 650db59e09..d5a6d23186 100644 --- a/public/language/fa-IR/users.json +++ b/public/language/fa-IR/users.json @@ -1,12 +1,13 @@ { "all-users": "همه کاربران", + "followed-users": "Followed Users", "latest-users": "آخرین کاربران", "top-posters": "برترین فرستنده‌ها", "most-reputation": "بیشترین اعتبار", "most-flags": "بیشترین پرچم‌ها", "search": "جستجو", "enter-username": "یک نام کاربری برای جستجو وارد کنید", - "search-user-for-chat": "Search for a user to start chat", + "search-user-for-chat": "جستوجو یک کاربر برای شروع گفتوگو", "load-more": "بارگذاری بیش‌تر", "users-found-search-took": "%1 کاربر(ها) یافت شد! جستجو %2 ثانیه زمان گرفت.", "filter-by": "فیلتر با", diff --git a/public/language/fi/admin/development/info.json b/public/language/fi/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/fi/admin/development/info.json +++ b/public/language/fi/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/fi/admin/extend/widgets.json b/public/language/fi/admin/extend/widgets.json index d8fa5752ef..17970f4284 100644 --- a/public/language/fi/admin/extend/widgets.json +++ b/public/language/fi/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/fi/admin/settings/reputation.json b/public/language/fi/admin/settings/reputation.json index d419597bee..89b2171ee9 100644 --- a/public/language/fi/admin/settings/reputation.json +++ b/public/language/fi/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/fi/error.json b/public/language/fi/error.json index 295f026649..f682120011 100644 --- a/public/language/fi/error.json +++ b/public/language/fi/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).", "cant-chat-with-yourself": "Et voi keskustella itsesi kanssa!", "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": "Keskustelujärjestelmä on pois käytöstä", "too-many-messages": "You have sent too many messages, please wait awhile.", "invalid-chat-message": "Virheellinen keskusteluviesti", diff --git a/public/language/fi/modules.json b/public/language/fi/modules.json index 96ad8a5df3..964a9fc744 100644 --- a/public/language/fi/modules.json +++ b/public/language/fi/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chat with", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Siirry uusimpaan viestiin", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/fi/notifications.json b/public/language/fi/notifications.json index 96cc80eb9f..707aac1ae1 100644 --- a/public/language/fi/notifications.json +++ b/public/language/fi/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 on kirjoittanut uuden aiheen: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 aloitti uuden aiheen kategoriassa %2", "user-started-following-you": "%1 alkoi seurata sinua.", "user-started-following-you-dual": "%1 ja %2 alkoivat seurata sinua", @@ -75,6 +75,7 @@ "email-confirmed": "Sähköpostiosoite on vahvistettu", "email-confirmed-message": "Kiitos sähköpostiosoitteesi vahvistamisesta. Käyttäjätilisi on nyt täysin aktivoitu.", "email-confirm-error-message": "Ongelma sähköpostiosoitteen vahvistamisessa. Ehkäpä koodi oli virheellinen tai vanhentunut.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Vahvistusviesti on lähetetty.", "none": "Ei mitään", "notification-only": "ilmoita vain sivustolla", diff --git a/public/language/fi/post-queue.json b/public/language/fi/post-queue.json index ebf195ae94..30bdf827a0 100644 --- a/public/language/fi/post-queue.json +++ b/public/language/fi/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/fi/user.json b/public/language/fi/user.json index 6522417524..836e539af8 100644 --- a/public/language/fi/user.json +++ b/public/language/fi/user.json @@ -78,6 +78,7 @@ "change-password": "Vaihda salasana", "change-password-error": "Virheellinen salasana", "change-password-error-wrong-current": "Nykyinen salasanasi ei ole oikein!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Salasanojen täytyy olla samat!", "change-password-error-privileges": "Sinulla ei ole oikeuksia vaihtaa tätä salasanaa.", "change-password-success": "Salasanasi on päivitetty!", diff --git a/public/language/fi/users.json b/public/language/fi/users.json index 6891926beb..bad5b3e7ab 100644 --- a/public/language/fi/users.json +++ b/public/language/fi/users.json @@ -1,5 +1,6 @@ { "all-users": "Kaikki käyttäjät", + "followed-users": "Followed Users", "latest-users": "Viimeisimmät käyttäjät", "top-posters": "Aktiivisimmat julkaisijat", "most-reputation": "Maineikkain", diff --git a/public/language/fr/admin/development/info.json b/public/language/fr/admin/development/info.json index b33bf0a4fa..3f9de021d1 100644 --- a/public/language/fr/admin/development/info.json +++ b/public/language/fr/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 noeuds ont répondu en %2ms !", "host": "hôte", - "primary": "Tâches principales / Exécuter", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "en ligne", @@ -19,6 +19,7 @@ "registered": "Enregistré", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Invités", "info": "Info" diff --git a/public/language/fr/admin/extend/widgets.json b/public/language/fr/admin/extend/widgets.json index fae5f066c8..01132fc81b 100644 --- a/public/language/fr/admin/extend/widgets.json +++ b/public/language/fr/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Carte", "container.card-header": "En-tête", "container.card-body": "Corps", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alerte", "alert.confirm-delete": "Êtes-vous sûr de vouloir supprimer ce widget ?", diff --git a/public/language/fr/admin/settings/reputation.json b/public/language/fr/admin/settings/reputation.json index 876c9a48e7..28090542fe 100644 --- a/public/language/fr/admin/settings/reputation.json +++ b/public/language/fr/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Paramètres de réputation", "disable": "Désactiver le système de réputation", "disable-down-voting": "Désactiver les votes négatifs", - "votes-are-public": "Tous les votes sont publics", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Seuils d'activité", "min-rep-upvote": "Réputation minimale pour voter pour les publications", "upvotes-per-day": "Votes positifs par jour (0 = illimité)", diff --git a/public/language/fr/error.json b/public/language/fr/error.json index 06403eb7a0..bde9263992 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Votre texte \"à propos de moi\" ne peut dépasser %1 caractère(s).", "cant-chat-with-yourself": "Vous ne pouvez discuter avec vous-même !", "chat-restricted": "Cet utilisateur a restreint ses messages de chat. Il doit d'abord s'abonner à votre compte avant que vous puissiez discuter avec lui.", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Système de chat désactivé", "too-many-messages": "Vous avez envoyé trop de messages, veuillez patienter un instant.", "invalid-chat-message": "Message de chat invalide", diff --git a/public/language/fr/modules.json b/public/language/fr/modules.json index ad46215cfb..cc43da924f 100644 --- a/public/language/fr/modules.json +++ b/public/language/fr/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Discussion %1", "chat.chatting-with": "Discuter avec", - "chat.placeholder": "Écrire vos message ici, glisser & déposer les images, valider sur entrée pour envoyer", - "chat.placeholder.mobile": "Saisir ici le message", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Aller au message le plus récent", "chat.usernames-and-x-others": "%1 & %2 autres", "chat.chat-with-usernames": "Discuter avec %1", diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json index a165b91046..0abbf4868e 100644 --- a/public/language/fr/notifications.json +++ b/public/language/fr/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 et %3 autres ont posté des réponses dans : %4", "user-posted-topic": "%1 a posté un nouveau sujet: %2", "user-edited-post": "%1 a édité un message dans %2", - "user-posted-topic-with-tag": "%1 a posté un nouveau sujet avec le mot-clé %2", - "user-posted-topic-with-tag-dual": "%1 a posté un nouveau sujet avec le mot-clé %2 et %3", - "user-posted-topic-with-tag-triple": "%1 a posté un nouveau sujet avec les mot-clés %2, %3 et %4", - "user-posted-topic-with-tag-multiple": "%1 a posté un nouveau sujet avec les mot-clés %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 a posté un nouveau sujet: %2", "user-started-following-you": "%1 vous suit.", "user-started-following-you-dual": "%1 et %2 se sont abonnés à votre compte.", @@ -75,6 +75,7 @@ "email-confirmed": "E-mail vérifié", "email-confirmed-message": "Merci pour la validation de votre adresse e-mail. Votre compte est désormais activé.", "email-confirm-error-message": "Il y a un un problème dans la vérification de votre adresse e-mail. Le code est peut être invalide ou a expiré.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "E-mail de vérification envoyé.", "none": "aucun", "notification-only": "Seulement une notification", diff --git a/public/language/fr/post-queue.json b/public/language/fr/post-queue.json index 04758af10b..0c30494b30 100644 --- a/public/language/fr/post-queue.json +++ b/public/language/fr/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Supprimer la sélection", "remove-selected-confirm": "Voulez-vous supprimer %1 messages sélectionnés ?", "bulk-accept-success": "%1 messages acceptés", - "bulk-reject-success": "%1 messages rejetés" + "bulk-reject-success": "%1 messages rejetés", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/fr/user.json b/public/language/fr/user.json index 9bbc717fb1..d70a797344 100644 --- a/public/language/fr/user.json +++ b/public/language/fr/user.json @@ -78,6 +78,7 @@ "change-password": "Changer le mot de passe", "change-password-error": "Mot de passe invalide !", "change-password-error-wrong-current": "Votre mot de passe est incorrect !", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Les mots de passe doivent être identiques !", "change-password-error-privileges": "Vous n'avez pas les droits de changer ce mot de passe.", "change-password-success": "Votre mot de passe a été mis à jour.", diff --git a/public/language/fr/users.json b/public/language/fr/users.json index e0417609bb..d91152241f 100644 --- a/public/language/fr/users.json +++ b/public/language/fr/users.json @@ -1,5 +1,6 @@ { "all-users": "Tous les utilisateurs", + "followed-users": "Followed Users", "latest-users": "Derniers inscrits", "top-posters": "Utilisateurs les plus actifs", "most-reputation": "Meilleur Réputation", diff --git a/public/language/gl/admin/development/info.json b/public/language/gl/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/gl/admin/development/info.json +++ b/public/language/gl/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/gl/admin/extend/widgets.json b/public/language/gl/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/gl/admin/extend/widgets.json +++ b/public/language/gl/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/gl/admin/settings/reputation.json b/public/language/gl/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/gl/admin/settings/reputation.json +++ b/public/language/gl/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/gl/error.json b/public/language/gl/error.json index 00b2c7f34d..9e85520ac3 100644 --- a/public/language/gl/error.json +++ b/public/language/gl/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Desculpa, o teu \"sobre min\" non pode supera-los %1 caracteres,", "cant-chat-with-yourself": "Non podes falar contigo mesmo!", "chat-restricted": "Este usuario restrinxiu as charlas. Debedes seguirvos antes de que poidas falar con el.", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Charlas desactivadas", "too-many-messages": "Estás a enviar moitas mensaxes, por favor, agarda un anaco.", "invalid-chat-message": "Mensaxe inválida", diff --git a/public/language/gl/modules.json b/public/language/gl/modules.json index 3d33b96021..9ae65b1d4f 100644 --- a/public/language/gl/modules.json +++ b/public/language/gl/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chat with", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/gl/notifications.json b/public/language/gl/notifications.json index a4511bc9b9..abbf8c88e7 100644 --- a/public/language/gl/notifications.json +++ b/public/language/gl/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 publicou un novo tema: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 comezou a seguirte.", "user-started-following-you-dual": "%1 e %2 comezaron a seguirte.", @@ -75,6 +75,7 @@ "email-confirmed": "Correo confirmado", "email-confirmed-message": "Grazas por validar o teu correo. A túa conta agora está activada.", "email-confirm-error-message": "Houbo un problema validando o teu correo. Poida que o código fose inválido ou expirase.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Correo de confirmación enviado.", "none": "None", "notification-only": "Notification Only", diff --git a/public/language/gl/post-queue.json b/public/language/gl/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/gl/post-queue.json +++ b/public/language/gl/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/gl/user.json b/public/language/gl/user.json index f07ed633df..bba8ac92a6 100644 --- a/public/language/gl/user.json +++ b/public/language/gl/user.json @@ -78,6 +78,7 @@ "change-password": "Cambia-lo contrasinal", "change-password-error": "Contrasinal inválido", "change-password-error-wrong-current": "O contrasinal actual é incorrecto!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Os contrasinais teñen que coincidir!", "change-password-error-privileges": "Non tes autorización para cambia-lo contrasinal", "change-password-success": "O teu contrasinal foi actualizado!", diff --git a/public/language/gl/users.json b/public/language/gl/users.json index d5690a4258..fab274ce42 100644 --- a/public/language/gl/users.json +++ b/public/language/gl/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Últimos usuarios", "top-posters": "Maiores Publicadores", "most-reputation": "Máis Reputados", diff --git a/public/language/he/admin/development/info.json b/public/language/he/admin/development/info.json index b3a30f3a12..e97a7a872b 100644 --- a/public/language/he/admin/development/info.json +++ b/public/language/he/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 צמתים הגיבו בתוך %2מילי שניות!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "מקוון", @@ -19,6 +19,7 @@ "registered": "רשום", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "אורחים", "info": "מידע" diff --git a/public/language/he/admin/extend/widgets.json b/public/language/he/admin/extend/widgets.json index 0a41084f8d..30957ea6aa 100644 --- a/public/language/he/admin/extend/widgets.json +++ b/public/language/he/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "כרטיס", "container.card-header": "כותרת כרטיס", "container.card-body": "גוף כרטיס", + "container.title": "Title", + "container.body": "Body", "container.alert": "התראה", "alert.confirm-delete": "האם אתה בטוח שאתה רוצה למחוק את הווידג'ט?", diff --git a/public/language/he/admin/settings/reputation.json b/public/language/he/admin/settings/reputation.json index f103a053ea..92c5750044 100644 --- a/public/language/he/admin/settings/reputation.json +++ b/public/language/he/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "הגדרות מוניטין", "disable": "השבת מערכת המוניטין", "disable-down-voting": "השבת דיסלייק", - "votes-are-public": "כל ההצבעות פומביות", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "סף פעילות", "min-rep-upvote": "מוניטין מינימלי כדי להצביע בעד", "upvotes-per-day": "כמה פעמים ביום משתמש יוכל להצביע למעלה (הגדר ל-0 כדי לאפשר ללא הגבלה)", diff --git a/public/language/he/error.json b/public/language/he/error.json index e3cbccbf77..f2dc2eb2c1 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "מצטערים, דף האודות שלכם אינו יכול להיות ארוך מ-%1 תווים.", "cant-chat-with-yourself": "לא ניתן לעשות צ'אט עם עצמכם!", "chat-restricted": "משתמש זה חסם את הודעות הצ'אט שלו ממשתמשים זרים. המשתמש חייב לעקוב אחריכם לפני שתוכלו לשוחח איתו בצ'אט", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "מערכת הצ'אט לא פעילה", "too-many-messages": "שלחתם יותר מדי הודעות, אנא המתינו זמן מה.", "invalid-chat-message": "הודעת צ'אט לא תקינה", diff --git a/public/language/he/modules.json b/public/language/he/modules.json index 4b425dcaf8..b0abaa5719 100644 --- a/public/language/he/modules.json +++ b/public/language/he/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "חדר %1", "chat.chatting-with": "שוחחו בצ'אט עם", - "chat.placeholder": "כתבו תוכן הודעת הצ'אט כאן, ניתן לגרור ולשחרר כאן תמונות, הקישו אנטר לשליחה.", - "chat.placeholder.mobile": "הקלד הודעת צ'אט כאן", + "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", @@ -103,12 +104,12 @@ "composer.upload-file": "העלאת קובץ", "composer.zen-mode": "מסך מלא", "composer.select-category": "בחירת קטגוריה", - "composer.textarea.placeholder": "כתבו את תוכן הפוסט כאן. ניתן גם לגרור ולשחרר כאן תמונות.", + "composer.textarea.placeholder": "כתבו את תוכן הפוסט כאן. ניתן לגרור ולשחרר כאן תמונות.", "composer.post-queue-alert": "היי 👋! פורום זה משתמש במערכת אישור פוסטים. מכיוון שאתה משתמש חדש הפוסט שלך יוסתר עד שהוא יאושר על ידי צוות הניהול של הפורום.", "composer.schedule-for": "תזמון נושא ל", "composer.schedule-date": "תאריך", "composer.schedule-time": "שעה", - "composer.cancel-scheduling": "ביטול תיזמון", + "composer.cancel-scheduling": "ביטול תזמון", "composer.change-schedule-date": "שנה תאריך", "composer.set-schedule-date": "הגדרת תאריך", "composer.discard-all-drafts": "מחק את כל הטיוטות", diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json index 5ecb4b5aad..c9cbb4a4ce 100644 --- a/public/language/he/notifications.json +++ b/public/language/he/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 ו-%3 אחרים הגיבו ל: %4", "user-posted-topic": "%1 העלה נושא חדש: %2", "user-edited-post": "%1 ערך פוסט ב: %2", - "user-posted-topic-with-tag": "%1 פרסם נושא חדש עם התגית %2", - "user-posted-topic-with-tag-dual": "%1 פרסם נושא חדש עם התגיות %1 ו-%3", - "user-posted-topic-with-tag-triple": "%1 פרסם נושא חדש עם התגיות %2, %3 ו-%4", - "user-posted-topic-with-tag-multiple": "%1 פרסם נושא חדש עם התגיות %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 פרסם נושא חדש ב%2", "user-started-following-you": "%1 התחיל לעקוב אחריך.", "user-started-following-you-dual": "%1 ו-%2 התחילו לעקוב אחריך.", @@ -75,6 +75,7 @@ "email-confirmed": "כתובת המייל אושרה", "email-confirmed-message": "תודה שאישרת את כתובת המייל שלך. החשבון שלך פעיל כעת.", "email-confirm-error-message": "אירעה שגיאה בעת אישור המייל שלך. ייתכן כי הקוד היה שגוי או פג תוקף.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "מייל אישור נשלח.", "none": "אף אחד", "notification-only": "התראות בלבד", diff --git a/public/language/he/post-queue.json b/public/language/he/post-queue.json index 48f6626bae..39075a6299 100644 --- a/public/language/he/post-queue.json +++ b/public/language/he/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "הסרת נבחרים", "remove-selected-confirm": "האם להסיר %1 פוסטים שנבחרו?", "bulk-accept-success": "%1 פוסטים אושרו", - "bulk-reject-success": "%1 פוסטים נדחו" + "bulk-reject-success": "%1 פוסטים נדחו", + "links-in-this-post": "Links in this post" } \ No newline at end of file diff --git a/public/language/he/search.json b/public/language/he/search.json index 93dbdd6272..564a160918 100644 --- a/public/language/he/search.json +++ b/public/language/he/search.json @@ -15,10 +15,10 @@ "all-categories": "כל הקטגוריות", "categories-x": "קטגוריות: %1", "categories-watched-categories": "קטגוריות: קטגוריות במעקב", - "type-a-category": "הקלדו קטגוריה", + "type-a-category": "הקלידו קטגוריה", "tags": "תגיות", "tags-x": "תגיות: %1", - "type-a-tag": "הקלדו תגית", + "type-a-tag": "הקלידו תגית", "match-words": "התאמת מילים", "match-all-words": "התאמת כל המילים", "match-any-word": "התאמת מילה אחת לפחות", @@ -26,7 +26,7 @@ "any": "כל", "posted-by": "פורסם על-ידי", "posted-by-usernames": "פורסם על ידי: %1", - "type-a-username": "הקלדו שם משתמש", + "type-a-username": "הקלידו שם משתמש", "search-child-categories": "חיפוש בתתי קטגוריות", "has-tags": "עם תגיות", "reply-count": "כמות תגובות", 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/he/user.json b/public/language/he/user.json index 7b91ca75d9..a95cd24e3d 100644 --- a/public/language/he/user.json +++ b/public/language/he/user.json @@ -78,6 +78,7 @@ "change-password": "שנה סיסמה", "change-password-error": "סיסמה לא תקינה!", "change-password-error-wrong-current": "סיסמתך הנוכחית אינה נכונה!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "הסיסמאות לא תואמות!", "change-password-error-privileges": "אין לך את ההרשאות המתאימות לשנות סיסמה זו.", "change-password-success": "הסיסמה שלך עודכנה!", diff --git a/public/language/he/users.json b/public/language/he/users.json index 3d8f2d90af..67eb248c70 100644 --- a/public/language/he/users.json +++ b/public/language/he/users.json @@ -1,5 +1,6 @@ { "all-users": "כל המשתמשים", + "followed-users": "Followed Users", "latest-users": "משתמשים אחרונים", "top-posters": "מפרסמים הכי הרבה", "most-reputation": "המוניטין הגבוה ביותר", diff --git a/public/language/hr/admin/development/info.json b/public/language/hr/admin/development/info.json index 0eb118a954..3b21db6c9a 100644 --- a/public/language/hr/admin/development/info.json +++ b/public/language/hr/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "Domaćin", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "Na mreži", @@ -19,6 +19,7 @@ "registered": "Registriran", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Gosti", "info": "Info" diff --git a/public/language/hr/admin/extend/widgets.json b/public/language/hr/admin/extend/widgets.json index 03f5265acb..5e599bf6f7 100644 --- a/public/language/hr/admin/extend/widgets.json +++ b/public/language/hr/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Upozorenje", "alert.confirm-delete": "Sigurni ste da želite obrisati ovaj widget?", diff --git a/public/language/hr/admin/settings/reputation.json b/public/language/hr/admin/settings/reputation.json index 5802ad12cb..2db17a175d 100644 --- a/public/language/hr/admin/settings/reputation.json +++ b/public/language/hr/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Postavke reputacije", "disable": "Onemogući reputacije", "disable-down-voting": "Onemogući oduzimanje glasova", - "votes-are-public": "Svi glasovi su javni", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Prag aktivnosti", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/hr/error.json b/public/language/hr/error.json index 72b7f39112..dde76c1683 100644 --- a/public/language/hr/error.json +++ b/public/language/hr/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "O vama nemože biti duže od %1 znaka", "cant-chat-with-yourself": "Nemoguće je razgovarati sam sa sobom!", "chat-restricted": "Korisnik je ograničio razgovore. Mora vas pratiti prije nego možete razgovarati", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Razgovor onemogućen", "too-many-messages": "Poslali ste previše poruka, pričekajte.", "invalid-chat-message": "Netočna poruka.", diff --git a/public/language/hr/modules.json b/public/language/hr/modules.json index 6750e12f2a..2e9ffdd03a 100644 --- a/public/language/hr/modules.json +++ b/public/language/hr/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Razgovaraj s", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/hr/notifications.json b/public/language/hr/notifications.json index 8433cb789b..fe00fee869 100644 --- a/public/language/hr/notifications.json +++ b/public/language/hr/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 je otvorio novu temu: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 Vas sada prati.", "user-started-following-you-dual": "%1 i %2 vas sada prate.", @@ -75,6 +75,7 @@ "email-confirmed": "Email potvrđen", "email-confirmed-message": "Hvala na potvrdi emaila. Vaš račun je sada aktivan.", "email-confirm-error-message": "Nastao je problem pri potvrdi Vaše email adrese. Provjerite kod ili zatražite novi.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Provjera korisničkog emaila poslana.", "none": "None", "notification-only": "Obavijest samo", diff --git a/public/language/hr/post-queue.json b/public/language/hr/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/hr/post-queue.json +++ b/public/language/hr/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/hr/user.json b/public/language/hr/user.json index 5bc99ceadc..bc18680d2f 100644 --- a/public/language/hr/user.json +++ b/public/language/hr/user.json @@ -78,6 +78,7 @@ "change-password": "Promjeni lozinku", "change-password-error": "Netočna lozinka!", "change-password-error-wrong-current": "Vaša trenutačna lozinka nije točna!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Lozinke se moraju podudarati!", "change-password-error-privileges": "Nemate pravo mijenjati ovu lozinku.", "change-password-success": "Vaša lozinka je promijenjena!", diff --git a/public/language/hr/users.json b/public/language/hr/users.json index 4e19ec6e73..8fe88453d6 100644 --- a/public/language/hr/users.json +++ b/public/language/hr/users.json @@ -1,5 +1,6 @@ { "all-users": "Svi korisnici", + "followed-users": "Followed Users", "latest-users": "Posljednji korisnici", "top-posters": "Najviše objava", "most-reputation": "Najveća reputacija", diff --git a/public/language/hu/admin/development/info.json b/public/language/hu/admin/development/info.json index d67e35f340..48bf12d34b 100644 --- a/public/language/hu/admin/development/info.json +++ b/public/language/hu/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 csomópont válaszolt %2mp-n belül!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Regisztrált", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Vendégek", "info": "Információ" diff --git a/public/language/hu/admin/extend/widgets.json b/public/language/hu/admin/extend/widgets.json index 090f1b1996..d50677362d 100644 --- a/public/language/hu/admin/extend/widgets.json +++ b/public/language/hu/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Kártya", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Riasztás", "alert.confirm-delete": "Biztosan szeretnéd törölni ezt a modult?", diff --git a/public/language/hu/admin/settings/reputation.json b/public/language/hu/admin/settings/reputation.json index d98443850e..ea7b44203e 100644 --- a/public/language/hu/admin/settings/reputation.json +++ b/public/language/hu/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Hírnév beállítások", "disable": "Hírnév rendszer kikapcsolása", "disable-down-voting": "Leszavazás kikapcsolása", - "votes-are-public": "Minden szavazat nyilvános", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Aktivitás küszöb értékek", "min-rep-upvote": "Minimális hírnév a hozzászólások pozitív szavazásához", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/hu/error.json b/public/language/hu/error.json index 124ab066db..6d5ece2e4d 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "A bemutatkozás nem lehet hosszabb %1 karakternél.", "cant-chat-with-yourself": "Nem cseveghetsz magaddal!", "chat-restricted": "Ez a felhasználó korlátozta a chat beállításait. Csak akkor cseveghetsz vele, miután felvett a követettek közé téged", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Csevegés funkció kikapcsolva", "too-many-messages": "Túl sok üzenetet küldtél, kérlek várj egy picit.", "invalid-chat-message": "Érvénytelen üzenet", diff --git a/public/language/hu/modules.json b/public/language/hu/modules.json index d59eab74e2..39bc19df38 100644 --- a/public/language/hu/modules.json +++ b/public/language/hu/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Csevegés vele", - "chat.placeholder": "Írja be ide a csevegőüzenetet, húzza át a képeket, majd nyomja meg az Enter billentyűt a küldéshez", - "chat.placeholder.mobile": "Írja be ide a csevegő üzenetet", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 és mások", "chat.chat-with-usernames": "Csevegés a következővel: %1", diff --git a/public/language/hu/notifications.json b/public/language/hu/notifications.json index e1398d636e..6ca199782b 100644 --- a/public/language/hu/notifications.json +++ b/public/language/hu/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 új témakört hozott létre: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 új témakört hozott létre: %2", "user-started-following-you": "%1 elkezdett követni téged.", "user-started-following-you-dual": "%1 és%2 elkezdett követni téged.", @@ -75,6 +75,7 @@ "email-confirmed": "E-mail megerősítve", "email-confirmed-message": "Köszönjük az e-mail címed megerősítését. A fiókod mostantól teljesen aktiválva van.", "email-confirm-error-message": "Probléma lépett fel az e-mail címed megerősítésekor. Talán a kód érvénytelen volt vagy lejárt.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Megerősítő e-mail elküldve.", "none": "Nincs", "notification-only": "Csak értesítés", diff --git a/public/language/hu/post-queue.json b/public/language/hu/post-queue.json index 90062aaf46..d7be0c7070 100644 --- a/public/language/hu/post-queue.json +++ b/public/language/hu/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Kiválasztott eltávolítása ", "remove-selected-confirm": "El szeretné távolítani %1 kijelölt bejegyzést?", "bulk-accept-success": "%1 bejegyzés elfogadva", - "bulk-reject-success": "%1 bejegyzés elutasítva" + "bulk-reject-success": "%1 bejegyzés elutasítva", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/hu/user.json b/public/language/hu/user.json index 083785c9e3..e208853768 100644 --- a/public/language/hu/user.json +++ b/public/language/hu/user.json @@ -78,6 +78,7 @@ "change-password": "Jelszó módosítása", "change-password-error": "Érvénytelen jelszó!", "change-password-error-wrong-current": "A jelenlegi jelszavad nem megfelelő!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "A jelszavak nem egyeznek!", "change-password-error-privileges": "Nincs jogod megváltoztatni ezt a jelszót.", "change-password-success": "A jelszavad frissítve!", diff --git a/public/language/hu/users.json b/public/language/hu/users.json index 5c10cca3ec..f47545cd78 100644 --- a/public/language/hu/users.json +++ b/public/language/hu/users.json @@ -1,5 +1,6 @@ { "all-users": "Összes Felhasználó", + "followed-users": "Followed Users", "latest-users": "Legújabb felhasználók", "top-posters": "Legaktívabbak", "most-reputation": "Legnépszerűbbek", diff --git a/public/language/hy/admin/development/info.json b/public/language/hy/admin/development/info.json index 881192a02e..ca2bdf9f66 100644 --- a/public/language/hy/admin/development/info.json +++ b/public/language/hy/admin/development/info.json @@ -3,7 +3,7 @@ "ip": " IP % 1", "nodes-responded": "%1 հանգույցներ արձագանքեցին %2ms-ի սահմաններում:", "host": "host", - "primary": "առաջնային / գործարկվող աշխատատեղեր", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "առցանց", @@ -19,6 +19,7 @@ "registered": "Գրանցված", "sockets": "Վարդակներ", + "connection-count": "Connection Count", "guests": "Հյուրեր", "info": "տեղեկատվություն" diff --git a/public/language/hy/admin/extend/widgets.json b/public/language/hy/admin/extend/widgets.json index a8928471c5..d54fd6f5ff 100644 --- a/public/language/hy/admin/extend/widgets.json +++ b/public/language/hy/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Քարտ", "container.card-header": "Քարտի վերնագիր", "container.card-body": "Քարտի կառուցվածք", + "container.title": "Title", + "container.body": "Body", "container.alert": "Զգուշացում", "alert.confirm-delete": "Վստա՞հ եք, որ ցանկանում եք ջնջել այս վիջեթը:", diff --git a/public/language/hy/admin/settings/reputation.json b/public/language/hy/admin/settings/reputation.json index e11aaccc65..b1785d9487 100644 --- a/public/language/hy/admin/settings/reputation.json +++ b/public/language/hy/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Վարկանիշի կարգավորումներ", "disable": "Անջատել վարկանիշի համակարգը", "disable-down-voting": "Անջատել Down Voting-ը", - "votes-are-public": "Բոլոր ձայները հրապարակային են", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Անջատել վարկանիշի համակարգը", "min-rep-upvote": "Նվազագույն հեղինակություն դրական քվեարկության համար", "upvotes-per-day": "Օրական կողմ ձայներ (սահմանված է 0 անսահմանափակ կողմ ձայների համար)", diff --git a/public/language/hy/error.json b/public/language/hy/error.json index c5166adb4c..d06500260e 100644 --- a/public/language/hy/error.json +++ b/public/language/hy/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Ներեցեք, ձեր իմ մասին չի կարող լինել ավելի քան %1 նիշ(ներ):", "cant-chat-with-yourself": "Դուք չեք կարող զրուցել ինքներդ ձեզ հետ:", "chat-restricted": "Նրանք պետք է հետևեն ձեզ, որպեսզի կարողանաք զրուցել նրանց հետ", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Զրույցի համակարգն անջատված է", "too-many-messages": "Դուք չափազանց շատ հաղորդագրություններ եք ուղարկել, խնդրում ենք սպասել մի քիչ:", "invalid-chat-message": "Զրույցի անվավեր հաղորդագրություն", diff --git a/public/language/hy/modules.json b/public/language/hy/modules.json index e121ea6bf1..62f73844d5 100644 --- a/public/language/hy/modules.json +++ b/public/language/hy/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Սենյակ %1", "chat.chatting-with": "Զրուցել", - "chat.placeholder": "Գրեք հաղորդագրություն այստեղ, տեղադրեք նկարներ, սեղմեք \"enter\" ուղարկելու համար", - "chat.placeholder.mobile": "Գրեք նամակը այստեղ", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Ցույց տալ վերջին նամակը", "chat.usernames-and-x-others": "%1 և %2 ուրիշները", "chat.chat-with-usernames": "Գրել %1 - ին", diff --git a/public/language/hy/notifications.json b/public/language/hy/notifications.json index 96a515cbd4..ed3f074473 100644 --- a/public/language/hy/notifications.json +++ b/public/language/hy/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 և %3 ուրիշները պատասխանել են %4 - ին։", "user-posted-topic": "%1-ը նոր թեմա է տեղադրել՝ %2", "user-edited-post": "%1-ը խմբագրել է գրառում %2-ում", - "user-posted-topic-with-tag": "%1 պիտակով նոր թեմա է տեղադրել %2 - ում։", - "user-posted-topic-with-tag-dual": "%1 պիտակով նոր թեմա է տեղադրել %2 և %3 - ում։", - "user-posted-topic-with-tag-triple": "%1 պիտակով նոր թեմա է տեղադրել %2, %3 և %4 - ում։", - "user-posted-topic-with-tag-multiple": "%1 պիտակով նոր թեմա է տեղադրել %2 - ում։", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 նոր թեմա է տեղադրել %2", "user-started-following-you": "%1 սկսեց հետևել ձեզ", "user-started-following-you-dual": "%1 և %2 սկսեցին հետևել ձեզ:", @@ -75,6 +75,7 @@ "email-confirmed": "Էլփոստը հաստատված է", "email-confirmed-message": "Շնորհակալություն ձեր էլփոստը հաստատելու համար: Ձեր հաշիվն այժմ ամբողջությամբ ակտիվացված է:", "email-confirm-error-message": "Ձեր էլփոստի հասցեն վավերացնելիս խնդիր առաջացավ: Հավանաբար կոդը անվավեր է կամ ժամկետանց է:", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Հաստատման էլփոստը ուղարկվել է", "none": "None", "notification-only": "Միայն ծանուցում", diff --git a/public/language/hy/post-queue.json b/public/language/hy/post-queue.json index a5dc59fcf4..2dae2a1575 100644 --- a/public/language/hy/post-queue.json +++ b/public/language/hy/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Հեռացնել ընտրվածը", "remove-selected-confirm": "Ցանկանու՞մ եք հեռացնել %1 ընտրված գրառումները:", "bulk-accept-success": "Ընդունված է %1 գրառում", - "bulk-reject-success": "%1 գրառում մերժվել է" + "bulk-reject-success": "%1 գրառում մերժվել է", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/hy/user.json b/public/language/hy/user.json index 27c5e0b5af..ac2228c424 100644 --- a/public/language/hy/user.json +++ b/public/language/hy/user.json @@ -78,6 +78,7 @@ "change-password": "փոխել գաղտնաբառը", "change-password-error": "Սխալ գաղտնաբառ", "change-password-error-wrong-current": "Ձեր ընթացիկ գաղտնաբառը սխալ է", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Գաղտնաբառը պետք է համընկնի", "change-password-error-privileges": "Դուք իրավունք չունեք փոխելու այս գաղտնաբառը:", "change-password-success": "Ձեր գաղտնաբառը թարմացվել է:", diff --git a/public/language/hy/users.json b/public/language/hy/users.json index e94f9f3271..42c66aa7e9 100644 --- a/public/language/hy/users.json +++ b/public/language/hy/users.json @@ -1,5 +1,6 @@ { "all-users": "Բոլոր օգտատերերը", + "followed-users": "Followed Users", "latest-users": "Վերջին օգտատերերը", "top-posters": "Ամենաշատ գրառողները", "most-reputation": "Ամենաբարձր վարկանիշը", diff --git a/public/language/id/admin/development/info.json b/public/language/id/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/id/admin/development/info.json +++ b/public/language/id/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/id/admin/extend/widgets.json b/public/language/id/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/id/admin/extend/widgets.json +++ b/public/language/id/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/id/admin/settings/reputation.json b/public/language/id/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/id/admin/settings/reputation.json +++ b/public/language/id/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/id/error.json b/public/language/id/error.json index 6ad4b31b96..51e20212f9 100644 --- a/public/language/id/error.json +++ b/public/language/id/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).", "cant-chat-with-yourself": "Kamu tidak dapat chat dengan akun sendiri", "chat-restricted": "Pengguna ini telah membatasi percakapa mereka. Mereka harus mengikutimu sebelum kamu dapat melakukan percakapan dengan mereka", + "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/id/modules.json b/public/language/id/modules.json index 991e7bfeb8..9222e101f9 100644 --- a/public/language/id/modules.json +++ b/public/language/id/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Berbincang dengan", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/id/notifications.json b/public/language/id/notifications.json index 4b6259caba..0a067492e4 100644 --- a/public/language/id/notifications.json +++ b/public/language/id/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 telah membuat topik baru: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 mulai mengikutimu.", "user-started-following-you-dual": "%1 and %2 started following you.", @@ -75,6 +75,7 @@ "email-confirmed": "Email telah Dikonfirmasi", "email-confirmed-message": "Terimakasih telah melakukan validasi email. Akunmu saat ini telah aktif sepenuhnya.", "email-confirm-error-message": "Terjadi masalah saat melakukan validasi emailmu. Mungkin terjadi kesalahan kode atau waktu habis.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Email konfirmasi telah dikirim.", "none": "None", "notification-only": "Notification Only", diff --git a/public/language/id/post-queue.json b/public/language/id/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/id/post-queue.json +++ b/public/language/id/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/id/user.json b/public/language/id/user.json index a8e0f29e1e..e13955912d 100644 --- a/public/language/id/user.json +++ b/public/language/id/user.json @@ -78,6 +78,7 @@ "change-password": "Ganti Kata Sandi", "change-password-error": "Kata Sandi Salah!", "change-password-error-wrong-current": "Kata Sandi kamu saat ini salah!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Kata Sandi harus sesuai!", "change-password-error-privileges": "Kamu tidak memiliki hak untuk mengganti kata sandi ini.", "change-password-success": "Kata Sandi kamu telah diperbarui!", diff --git a/public/language/id/users.json b/public/language/id/users.json index 6d1ecde478..cbdb652b31 100644 --- a/public/language/id/users.json +++ b/public/language/id/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Pengguna Terakhir", "top-posters": "Posting Terbanyak", "most-reputation": "Reputasi Terbanyak", diff --git a/public/language/it/admin/development/info.json b/public/language/it/admin/development/info.json index 28b9bf2831..d5bb340bc5 100644 --- a/public/language/it/admin/development/info.json +++ b/public/language/it/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodi hanno risposto entro %2ms!", "host": "host", - "primary": "processi primari/eseguiti", + "primary": "primario / lavori", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registrato", "sockets": "Socket", + "connection-count": "Conteggio connessioni", "guests": "Ospiti", "info": "Informazioni" diff --git a/public/language/it/admin/extend/widgets.json b/public/language/it/admin/extend/widgets.json index 0b9b4cb2a4..d5ebc44952 100644 --- a/public/language/it/admin/extend/widgets.json +++ b/public/language/it/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Scheda", "container.card-header": "Intestazione della scheda", "container.card-body": "Corpo della scheda", + "container.title": "Titolo", + "container.body": "Corpo", "container.alert": "Avviso", "alert.confirm-delete": "Sei sicuro di voler eliminare questo widget?", diff --git a/public/language/it/admin/settings/reputation.json b/public/language/it/admin/settings/reputation.json index f84ec4ee04..5dd42ceeac 100644 --- a/public/language/it/admin/settings/reputation.json +++ b/public/language/it/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Impostazioni reputazione", "disable": "Disabilita sistema reputazione", "disable-down-voting": "Disabilita voto negativo", - "votes-are-public": "Tutti i voti sono pubblici", + "upvote-visibility": "Visibilità del voto positivo", + "upvote-visibility-all": "Tutti possono vedere i voti positivi", + "upvote-visibility-loggedin": "Solo gli utenti registrati possono vedere i voti positivi", + "upvote-visibility-privileged": "Solo gli utenti privilegiati come amministratori e moderatori possono visualizzare i voti positivi", + "downvote-visibility": "Visibilità del voto negativo", + "downvote-visibility-all": "Tutti possono vedere i voti negativi", + "downvote-visibility-loggedin": "Solo gli utenti registrati possono vedere i voti negativi", + "downvote-visibility-privileged": "Solo gli utenti privilegiati come amministratori e moderatori possono visualizzare i voti negativi", "thresholds": "Soglie di attività", "min-rep-upvote": "Reputazione minima per votare positivamente i post", "upvotes-per-day": "Voti positivi al giorno (impostare a 0 per i voti positivi illimitati)", diff --git a/public/language/it/error.json b/public/language/it/error.json index fa8cb7480f..b54386f4e4 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Spiacenti, il testo non può essere più lungo di %1 caratteri.", "cant-chat-with-yourself": "Non puoi chattare con te stesso!", "chat-restricted": "Questo utente ha ristretto i suoi messaggi in chat alle persone che segue. Per poter chattare con te ti deve prima seguire.", + "chat-user-blocked": "Sei stato bloccato da questo utente.", "chat-disabled": "Il sistema di chat è stato disabilitato", "too-many-messages": "Hai inviato troppi messaggi, aspetta un attimo.", "invalid-chat-message": "Messaggio chat non valido", diff --git a/public/language/it/modules.json b/public/language/it/modules.json index 1d29c33648..4a244172ac 100644 --- a/public/language/it/modules.json +++ b/public/language/it/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Stanza %1", "chat.chatting-with": "Messaggia con", - "chat.placeholder": "Digita il messaggio di chat qui, trascina le immagini, premi invio per inviare", - "chat.placeholder.mobile": "Digita il messaggio di chat qui", + "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/notifications.json b/public/language/it/notifications.json index 737dfd0f20..b9a35fcac8 100644 --- a/public/language/it/notifications.json +++ b/public/language/it/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 e %3 altri hanno postato risposte a: %4", "user-posted-topic": "%1 ha postato una nuova discussione: %2", "user-edited-post": "%1 ha modificato un post in %2", - "user-posted-topic-with-tag": "%1 ha postato una nuova discussione con tag %2", - "user-posted-topic-with-tag-dual": "%1 ha postato una nuova discussione con i tag %2 e %3", - "user-posted-topic-with-tag-triple": "%1 ha postato una nuova discussione con e tag %2, %3 e %4", - "user-posted-topic-with-tag-multiple": "%1 ha postato una nuova discussione con i tag %2", + "user-posted-topic-with-tag": "%1 ha postato %2 (taggato %3)", + "user-posted-topic-with-tag-dual": "%1 ha postato %2 (taggato %3 e %4)", + "user-posted-topic-with-tag-triple": "%1 ha postato %2 (taggato %3, %4, e %5)", + "user-posted-topic-with-tag-multiple": "%1 ha postato %2 (taggato %3)", "user-posted-topic-in-category": "%1 ha postato una nuova discussione in %2", "user-started-following-you": "%1 ha iniziato a seguirti.", "user-started-following-you-dual": "%1 e %2 hanno iniziato a seguirti.", @@ -75,6 +75,7 @@ "email-confirmed": "Email Confermata", "email-confirmed-message": "Grazie per aver validato la tua email. Il tuo account è ora completamente attivato.", "email-confirm-error-message": "C'è stato un problema nella validazione del tuo indirizzo email. Potrebbe essere il codice non valido o scaduto.", + "email-confirm-error-message-already-validated": "Il tuo indirizzo email è già stato convalidato.", "email-confirm-sent": "Email di conferma inviata.", "none": "Nessuna", "notification-only": "Solo Notifiche", diff --git a/public/language/it/post-queue.json b/public/language/it/post-queue.json index 6e9deaa491..b9ebfe9bfb 100644 --- a/public/language/it/post-queue.json +++ b/public/language/it/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Rimuovi selezionati", "remove-selected-confirm": "Vuoi rimuovere %1 post selezionati?", "bulk-accept-success": "%1 post accettati", - "bulk-reject-success": "%1 post rifiutati" + "bulk-reject-success": "%1 post rifiutati", + "links-in-this-post": "Link in questo post" } \ No newline at end of file diff --git a/public/language/it/themes/harmony.json b/public/language/it/themes/harmony.json index 130e1f2c48..b63252bdaa 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": "Mostra breadcrumb nelle pagine Categoria e Discussione", + "settings.enableBreadcrumbs.why": "I breadcrumb sono visibili nella maggior parte delle pagine per facilitare la navigazione. Il design di base delle pagine delle categorie e delle discussioni prevede mezzi alternativi per ricollegarsi alle pagine principali, ma il breadcrumb può essere disattivato per ridurre la confusione.", "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/it/user.json b/public/language/it/user.json index 7f5bac3720..157d3c22a4 100644 --- a/public/language/it/user.json +++ b/public/language/it/user.json @@ -78,6 +78,7 @@ "change-password": "Cambia la Password", "change-password-error": "Password non valida!", "change-password-error-wrong-current": "La tua password corrente non è corretta!", + "change-password-error-same-password": "La tua nuova password corrisponde alla password attuale, utilizza una nuova password.", "change-password-error-match": "Le password devono coincidere!", "change-password-error-privileges": "Non hai il permesso di cambiare questa password.", "change-password-success": "La tua password è stata aggiornata!", diff --git a/public/language/it/users.json b/public/language/it/users.json index bfbbc52a6f..bf4e3b0aca 100644 --- a/public/language/it/users.json +++ b/public/language/it/users.json @@ -1,5 +1,6 @@ { "all-users": "Tutti gli utenti", + "followed-users": "Utenti seguiti", "latest-users": "Ultimi Utenti", "top-posters": "Utenti più attivi", "most-reputation": "Reputazione più alta", diff --git a/public/language/ja/admin/development/info.json b/public/language/ja/admin/development/info.json index f70dd00849..857c419a66 100644 --- a/public/language/ja/admin/development/info.json +++ b/public/language/ja/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "％1ノードは％2ms以内に応答しました！", "host": "ホスト", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "オンライン", @@ -19,6 +19,7 @@ "registered": "登録数", "sockets": "ソケット数", + "connection-count": "Connection Count", "guests": "ゲスト数", "info": "情報" diff --git a/public/language/ja/admin/extend/widgets.json b/public/language/ja/admin/extend/widgets.json index a6d4b8dc56..e6a320a8de 100644 --- a/public/language/ja/admin/extend/widgets.json +++ b/public/language/ja/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "警告", "alert.confirm-delete": "このウィジェットを削除してもよろしいですか？", diff --git a/public/language/ja/admin/settings/reputation.json b/public/language/ja/admin/settings/reputation.json index 2ae070ba58..790f0e1d0f 100644 --- a/public/language/ja/admin/settings/reputation.json +++ b/public/language/ja/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "評価の設定", "disable": "レピュテーションシステムを無効にする", "disable-down-voting": "低評価を無効にする", - "votes-are-public": "すべての投票は公開されています", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "アクティビティのしきい値", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/ja/error.json b/public/language/ja/error.json index 651ca4edcc..fe36d33b8e 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "申し訳ありませんが、あなたの私についての項目が%1より長くすることができません。", "cant-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/ja/modules.json b/public/language/ja/modules.json index 221c7c04c9..597165666b 100644 --- a/public/language/ja/modules.json +++ b/public/language/ja/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "とチャット", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json index ab09acafd9..679de2e917 100644 --- a/public/language/ja/notifications.json +++ b/public/language/ja/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 が新しいスレッドを投稿しました。: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1があなたをフォローしました。", "user-started-following-you-dual": "%1 と %2 があなたをフォローしました。", @@ -75,6 +75,7 @@ "email-confirmed": "Eメールが確認されました", "email-confirmed-message": "メールアドレス検証をして頂き、ありがとうございます。あなたのアカウントは完全にアクティブになりました。", "email-confirm-error-message": "あなたのEメールアドレス検証に問題があります。コードが無効か、期限切れです。", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "確認メールが送信されました。", "none": "なし", "notification-only": "通知のみ", diff --git a/public/language/ja/post-queue.json b/public/language/ja/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/ja/post-queue.json +++ b/public/language/ja/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/ja/user.json b/public/language/ja/user.json index bba4d3a261..7aaf0e8cd2 100644 --- a/public/language/ja/user.json +++ b/public/language/ja/user.json @@ -78,6 +78,7 @@ "change-password": "パスワードを変更", "change-password-error": "無効のパスワード！", "change-password-error-wrong-current": "現在のパスワードは正しくありません！", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "パスワードは一致しません！", "change-password-error-privileges": "パスワードを更新する権限はありません。", "change-password-success": "パスワードを更新しました！", diff --git a/public/language/ja/users.json b/public/language/ja/users.json index acde8c9719..d0408692ee 100644 --- a/public/language/ja/users.json +++ b/public/language/ja/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "新しいユーザー", "top-posters": "最も投稿したユーザー", "most-reputation": "最も評価されたユーザー", diff --git a/public/language/ko/admin/development/info.json b/public/language/ko/admin/development/info.json index 4237eaa8ae..08cb8a739b 100644 --- a/public/language/ko/admin/development/info.json +++ b/public/language/ko/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1개의 노드가 %2밀리초 안에 응답했습니다!", "host": "호스트", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "PID", "nodejs": "Node.js", "online": "온라인", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "소켓", + "connection-count": "Connection Count", "guests": "비회원", "info": "정보" diff --git a/public/language/ko/admin/extend/widgets.json b/public/language/ko/admin/extend/widgets.json index 33add708a4..4c52217ff2 100644 --- a/public/language/ko/admin/extend/widgets.json +++ b/public/language/ko/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "이 위젯을 삭제하시겠습니까?", diff --git a/public/language/ko/admin/settings/reputation.json b/public/language/ko/admin/settings/reputation.json index 43bb0328db..0451e4bc49 100644 --- a/public/language/ko/admin/settings/reputation.json +++ b/public/language/ko/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "평판 설정", "disable": "평판 시스템 비활성화", "disable-down-voting": "비추천 비활성화", - "votes-are-public": "모든 투표 공개", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "활동 임계값", "min-rep-upvote": "게시물을 추천할 수 있는 최소 평판", "upvotes-per-day": "하루에 가능한 추천 횟수 (무제한 추천을 위해 0으로 설정)", diff --git a/public/language/ko/error.json b/public/language/ko/error.json index cb6153953c..f276a770ce 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "죄송합니다. 자기 소개는 최대 %1자보다 길 수 없습니다.", "cant-chat-with-yourself": "자기 자신과 채팅할 수 없습니다!", "chat-restricted": "이 사용자는 채팅 메시지를 제한했습니다. 채팅할 수 있도록 팔로우해야 합니다", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "채팅 시스템이 비활성화되었습니다", "too-many-messages": "너무 많은 메시지를 보냈습니다. 잠시 기다려주세요.", "invalid-chat-message": "유효하지 않은 채팅 메시지", diff --git a/public/language/ko/modules.json b/public/language/ko/modules.json index 29760612b9..f91693d75a 100644 --- a/public/language/ko/modules.json +++ b/public/language/ko/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "대화방 %1", "chat.chatting-with": "대화 중", - "chat.placeholder": "여기에 채팅 메시지를 입력하세요. 이미지는 끌어다 놓으세요. 전송하려면 Enter 키를 누르세요.", - "chat.placeholder.mobile": "여기에 채팅 메시지를 입력하세요.", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "가장 최근 메시지로 이동", "chat.usernames-and-x-others": "%1 및 다른 %2명", "chat.chat-with-usernames": "%1과 대화", diff --git a/public/language/ko/notifications.json b/public/language/ko/notifications.json index 1e9b72af2b..7f099f0c79 100644 --- a/public/language/ko/notifications.json +++ b/public/language/ko/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 및 다른 %3명이 답글을 게시했습니다: %4", "user-posted-topic": "%1님이 새 토픽을 게시했습니다: %2", "user-edited-post": "%1님이 %2에서 게시물을 편집했습니다.", - "user-posted-topic-with-tag": "%1님이 태그 %2를 포함한 새 토픽을 게시했습니다.", - "user-posted-topic-with-tag-dual": "%1님이 태그 %2 및 %3를 포함한 새 토픽을 게시했습니다.", - "user-posted-topic-with-tag-triple": "%1님이 태그 %2, %3 및 %4를 포함한 새 토픽을 게시했습니다.", - "user-posted-topic-with-tag-multiple": "%1님이 태그 %2를 포함한 새 토픽을 게시했습니다.", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1님이 카테고리 %2에 새 토픽을 게시했습니다.", "user-started-following-you": "%1님이 나를 팔로우하기 시작했습니다.", "user-started-following-you-dual": "%1 및 %2님이 나를 팔로우하기 시작했습니다.", @@ -75,6 +75,7 @@ "email-confirmed": "이메일 확인됨", "email-confirmed-message": "이메일 확인에 감사드립니다. 계정이 이제 완전히 활성화되었습니다.", "email-confirm-error-message": "이메일 주소를 확인하는 데 문제가 발생했습니다. 코드가 잘못되었거나 만료되었을 수 있습니다.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "확인 이메일이 전송되었습니다.", "none": "없음", "notification-only": "알림만", diff --git a/public/language/ko/post-queue.json b/public/language/ko/post-queue.json index 012d75df2e..4010f972a7 100644 --- a/public/language/ko/post-queue.json +++ b/public/language/ko/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "선택된 것 제거", "remove-selected-confirm": "선택된 %1개의 게시물을 제거하시겠습니까?", "bulk-accept-success": "%1개의 게시물이 승인되었습니다.", - "bulk-reject-success": "%1개의 게시물이 거부되었습니다." + "bulk-reject-success": "%1개의 게시물이 거부되었습니다.", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/ko/user.json b/public/language/ko/user.json index 6c95172b49..375df29975 100644 --- a/public/language/ko/user.json +++ b/public/language/ko/user.json @@ -78,6 +78,7 @@ "change-password": "비밀번호 변경", "change-password-error": "유효하지 않은 비밀번호!", "change-password-error-wrong-current": "현재 비밀번호가 올바르지 않습니다!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "비밀번호가 일치해야 합니다!", "change-password-error-privileges": "이 비밀번호를 변경할 권한이 없습니다.", "change-password-success": "비밀번호가 업데이트되었습니다!", diff --git a/public/language/ko/users.json b/public/language/ko/users.json index 56d2b1c1bc..22a34b4a92 100644 --- a/public/language/ko/users.json +++ b/public/language/ko/users.json @@ -1,5 +1,6 @@ { "all-users": "모든 사용자", + "followed-users": "Followed Users", "latest-users": "최신 사용자", "top-posters": "최다 게시자", "most-reputation": "가장 많은 평판", diff --git a/public/language/lt/admin/development/info.json b/public/language/lt/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/lt/admin/development/info.json +++ b/public/language/lt/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/lt/admin/extend/widgets.json b/public/language/lt/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/lt/admin/extend/widgets.json +++ b/public/language/lt/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/lt/admin/settings/reputation.json b/public/language/lt/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/lt/admin/settings/reputation.json +++ b/public/language/lt/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/lt/error.json b/public/language/lt/error.json index d329383e60..f1bbb93154 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Atsiprašome, bet aprašymas apie jus negali būti ilgesnis negu %1 simbolis (ių)", "cant-chat-with-yourself": "Jūs negalite susirašinėti su savimi!", "chat-restricted": "Šis vartotojas apribojo savo žinutes. Jie turi sekti jus kad jūs galėtumėte pradėti bendrauti su jais", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Susirašinėjimų sistema išjungta", "too-many-messages": "Išsiuntėte per daug pranešimų, kurį laiką prašome palaukti.", "invalid-chat-message": "Bloga žinutė", diff --git a/public/language/lt/modules.json b/public/language/lt/modules.json index 8d8f34de03..790766a5d3 100644 --- a/public/language/lt/modules.json +++ b/public/language/lt/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chat with", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/lt/notifications.json b/public/language/lt/notifications.json index c212e1b3de..47ba471ff7 100644 --- a/public/language/lt/notifications.json +++ b/public/language/lt/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 paskelbė naują temą: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 pradėjo sekti tave", "user-started-following-you-dual": "%1 and %2 started following you.", @@ -75,6 +75,7 @@ "email-confirmed": "El. paštas patvirtintas", "email-confirmed-message": "Dėkojame už el. pašto patvirtinimą. Jūsų paskyra pilnai aktyvuota.", "email-confirm-error-message": "Įvyko klaida mėginant patvirtinti Jūsų el. pašto adresą. Galbūt kodas yra neteisingas, arba nebegalioajantis.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Patvirtinimo laiškas išsiųstas.", "none": "None", "notification-only": "Notification Only", diff --git a/public/language/lt/post-queue.json b/public/language/lt/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/lt/post-queue.json +++ b/public/language/lt/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/lt/user.json b/public/language/lt/user.json index 1d9d72c74a..9a546285f2 100644 --- a/public/language/lt/user.json +++ b/public/language/lt/user.json @@ -78,6 +78,7 @@ "change-password": "Pakeisti slaptažodį", "change-password-error": "Negalimas slaptažodis!", "change-password-error-wrong-current": "Jūsų dabartinis slaptažodis neteisingas!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Slaptažodžiai privalo sutapti!", "change-password-error-privileges": "Jūs neturite teisių pakeisti šį slaptažodį.", "change-password-success": "Jūsų slaptažodis atnaujintas!", diff --git a/public/language/lt/users.json b/public/language/lt/users.json index 4febc6a4ae..06c20ade22 100644 --- a/public/language/lt/users.json +++ b/public/language/lt/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Paskutiniai vartotojai", "top-posters": "Geriausi autoriai", "most-reputation": "Didžiausia reputacija", diff --git a/public/language/lv/admin/development/info.json b/public/language/lv/admin/development/info.json index d07a526789..87cb89d8cf 100644 --- a/public/language/lv/admin/development/info.json +++ b/public/language/lv/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 serveri atbildēja %2ms laikā!", "host": "serveris", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "tiešsaistē", @@ -19,6 +19,7 @@ "registered": "Reģistrētie", "sockets": "Tīkla savienojumi", + "connection-count": "Connection Count", "guests": "Viesi", "info": "Info" diff --git a/public/language/lv/admin/extend/widgets.json b/public/language/lv/admin/extend/widgets.json index 851c089e33..0d7ae39171 100644 --- a/public/language/lv/admin/extend/widgets.json +++ b/public/language/lv/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Brīdinājums", "alert.confirm-delete": "Vai tiešām vēlies izdzēst šo logrīku?", diff --git a/public/language/lv/admin/settings/reputation.json b/public/language/lv/admin/settings/reputation.json index 6df67ebd1c..6192bdfe99 100644 --- a/public/language/lv/admin/settings/reputation.json +++ b/public/language/lv/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Ranga punktu sistēma", "disable": "Atspējot ranga punktu sistēmu", "disable-down-voting": "Atspējot balsošanu \"pret\"", - "votes-are-public": "Visi balsojumi ir publiski", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Aktivitātes sliekšņi", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/lv/error.json b/public/language/lv/error.json index 2fbd1cf4a8..0d71b060eb 100644 --- a/public/language/lv/error.json +++ b/public/language/lv/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Atvaino, Tavā \"Par mani\" nevar būt vairāk kā %1 rakstzīmes.", "cant-chat-with-yourself": "Nevar sarunāties pats ar sevi!", "chat-restricted": "Šis lietotājs ir ierobežojis savas sarunas. Viņam ir Tev jāseko, pirms vari sarunāties ar viņu", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Sarunu sistēma ir atspējota", "too-many-messages": "Tu esi publicējis pārāk daudz rakstu, lūdzu, kādu laiku uzgaidi.", "invalid-chat-message": "Nederīga saruna", diff --git a/public/language/lv/modules.json b/public/language/lv/modules.json index 41bd1996d3..b1c0ab27ef 100644 --- a/public/language/lv/modules.json +++ b/public/language/lv/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Sarunāties ar", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/lv/notifications.json b/public/language/lv/notifications.json index ef3573784a..b1c56866b7 100644 --- a/public/language/lv/notifications.json +++ b/public/language/lv/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 ir ievietojis jaunu tematu: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 sāka Tev sekot.", "user-started-following-you-dual": "%1 un %2 sāka Tev sekot.", @@ -75,6 +75,7 @@ "email-confirmed": "E-pasta adrese ir apstiprināta", "email-confirmed-message": "Paldies, ka apstiprināji e-pasta adresi. Tavs konts tagad ir pilnībā aktivizēts.", "email-confirm-error-message": "Tavā e-pasta adreses apstiprināšanā radās problēma. Iespējams, kods ir nederīgs vai ir beidzies derīguma termiņš.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Apstiprinājuma e-pasts ir nosūtīts.", "none": "Neko nedarīt", "notification-only": "Tikai paziņot", diff --git a/public/language/lv/post-queue.json b/public/language/lv/post-queue.json index 2a716a258e..31a5fc40f0 100644 --- a/public/language/lv/post-queue.json +++ b/public/language/lv/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/lv/user.json b/public/language/lv/user.json index d64918c487..aa1c0e6981 100644 --- a/public/language/lv/user.json +++ b/public/language/lv/user.json @@ -78,6 +78,7 @@ "change-password": "Mainīt paroli", "change-password-error": "Nederīga parole!", "change-password-error-wrong-current": "Pašreizējā parole nav pareiza!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Parolēm jāsakrīt!", "change-password-error-privileges": "Tev nav tiesības mainīt šo paroli.", "change-password-success": "Parole ir atjaunināta!", diff --git a/public/language/lv/users.json b/public/language/lv/users.json index 97e2626bf3..b016c675ac 100644 --- a/public/language/lv/users.json +++ b/public/language/lv/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Jaunākie lietotāji", "top-posters": "Visvairāk rakstu", "most-reputation": "Visvairāk ranga punktu", diff --git a/public/language/ms/admin/development/info.json b/public/language/ms/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/ms/admin/development/info.json +++ b/public/language/ms/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/ms/admin/extend/widgets.json b/public/language/ms/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/ms/admin/extend/widgets.json +++ b/public/language/ms/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/ms/admin/settings/reputation.json b/public/language/ms/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/ms/admin/settings/reputation.json +++ b/public/language/ms/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/ms/error.json b/public/language/ms/error.json index d17d2c54f7..49846b7e28 100644 --- a/public/language/ms/error.json +++ b/public/language/ms/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Maaf, penerangan tentang anda tidak boleh lebih %1 aksara().", "cant-chat-with-yourself": "Anda tidak boleh sembang dengan diri sendiri!", "chat-restricted": "Pengguna ini menyekat ruangan sembangnya. Dia hendaklah mengikut anda sebelum kalian dapat bersembang", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Sistem borak tidak diaktifkan", "too-many-messages": "Anda menghantar terlalu banyak pesanan, sila tunggu seketika.", "invalid-chat-message": "Mesej borak tidak sah", diff --git a/public/language/ms/modules.json b/public/language/ms/modules.json index 2e1026ca70..9cfae84566 100644 --- a/public/language/ms/modules.json +++ b/public/language/ms/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chat with", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/ms/notifications.json b/public/language/ms/notifications.json index a852e75ac5..e849c3d99b 100644 --- a/public/language/ms/notifications.json +++ b/public/language/ms/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 membuka topik baru : %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 mula mengikut anda.", "user-started-following-you-dual": "%1 dan %2 mula mengikuti anda.", @@ -75,6 +75,7 @@ "email-confirmed": "Emel Disahkan", "email-confirmed-message": "Terima kasih kerana mengesahkan emel anda. Akaun anda telah diaktifkan sepenuhnya.", "email-confirm-error-message": "Berlaku masalah semasa mengesahkan emel anda. Mungkin kod tidak sah atau tamat tempoh.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Pengesahan emel telah dihantar.", "none": "None", "notification-only": "Notification Only", diff --git a/public/language/ms/post-queue.json b/public/language/ms/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/ms/post-queue.json +++ b/public/language/ms/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/ms/user.json b/public/language/ms/user.json index f2ae132b26..63525d064c 100644 --- a/public/language/ms/user.json +++ b/public/language/ms/user.json @@ -78,6 +78,7 @@ "change-password": "Tukar kata laluan", "change-password-error": "Kata laluan salah!", "change-password-error-wrong-current": "Kata laluan anda sekarang tidak sah", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Kata laluan mesti padan", "change-password-error-privileges": "Anda tidak mempunyai kebenaran untuk mengubah kata laluan ini", "change-password-success": "Kata laluan dikemaskini", diff --git a/public/language/ms/users.json b/public/language/ms/users.json index 568a3c6d3c..91f6d4d969 100644 --- a/public/language/ms/users.json +++ b/public/language/ms/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Pengguna terkini", "top-posters": "Pengirim terbanyak", "most-reputation": "Reputasi terbaik", diff --git a/public/language/nb/admin/development/info.json b/public/language/nb/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/nb/admin/development/info.json +++ b/public/language/nb/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/nb/admin/extend/widgets.json b/public/language/nb/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/nb/admin/extend/widgets.json +++ b/public/language/nb/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/nb/admin/settings/reputation.json b/public/language/nb/admin/settings/reputation.json index c17d74f8ed..c0f19e8ee8 100644 --- a/public/language/nb/admin/settings/reputation.json +++ b/public/language/nb/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Omdømmeinnstillinger", "disable": "Skru av omdømmesystem", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum omdømme for å stemme opp innlegg", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/nb/error.json b/public/language/nb/error.json index 67c39591c6..8ec0487c84 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Beklager, om meg kan ikke være lengre enn %1 tegn.", "cant-chat-with-yourself": "Du kan ikke chatte med deg selv!", "chat-restricted": "Denne brukeren har begrenset sine samtalemeldinger. De må følge deg før du kan chatte med dem", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Chattesystem er deaktivert", "too-many-messages": "Du har sendt for mange meldinger, vennligst vent en stund.", "invalid-chat-message": "Ugyldig samtalemelding", diff --git a/public/language/nb/modules.json b/public/language/nb/modules.json index 27471d0082..909c1dca14 100644 --- a/public/language/nb/modules.json +++ b/public/language/nb/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Rom %1", "chat.chatting-with": "Chat med", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json index 29752bf30d..2914fa0986 100644 --- a/public/language/nb/notifications.json +++ b/public/language/nb/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 har skrevet en ny tråd: %2", "user-edited-post": "%1 har redigert ett innlegg i %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 har publisert et nytt innlegg i %2", "user-started-following-you": "%1 begynte å følge deg.", "user-started-following-you-dual": "%1 og 2% har begynt å følge deg.", @@ -75,6 +75,7 @@ "email-confirmed": "E-post bekreftet", "email-confirmed-message": "Takk for at du har validert din e-post. Kontoen din er nå fullstendig aktivert.", "email-confirm-error-message": "Det oppsto et problem under validering av e-posten din. Koden kan ha vært ugyldig eller ha utløpt.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Bekreftelses-e-post sendt.", "none": "Ingen", "notification-only": "Kun notifikasjon", diff --git a/public/language/nb/post-queue.json b/public/language/nb/post-queue.json index 58d2a16f8d..efec1c28f7 100644 --- a/public/language/nb/post-queue.json +++ b/public/language/nb/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/nb/user.json b/public/language/nb/user.json index ee7ab00a19..7d708a3975 100644 --- a/public/language/nb/user.json +++ b/public/language/nb/user.json @@ -78,6 +78,7 @@ "change-password": "Endre passord", "change-password-error": "Ugyldig passord!", "change-password-error-wrong-current": "Ditt gjeldende passord er ikke korrekt!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Passordene må samsvare!", "change-password-error-privileges": "Du har ikke rettigheter tli å endre dette passordet.", "change-password-success": "Passordet ditt ble oppdatert!", diff --git a/public/language/nb/users.json b/public/language/nb/users.json index 173ea13547..1f03314930 100644 --- a/public/language/nb/users.json +++ b/public/language/nb/users.json @@ -1,5 +1,6 @@ { "all-users": "Alle brukere", + "followed-users": "Followed Users", "latest-users": "Seneste brukere", "top-posters": "Flest innlegg", "most-reputation": "Best omdømme", diff --git a/public/language/nl/admin/development/info.json b/public/language/nl/admin/development/info.json index 774d976cc8..b5ee1a8838 100644 --- a/public/language/nl/admin/development/info.json +++ b/public/language/nl/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Geregistreerd", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Gasten", "info": "Informatie" diff --git a/public/language/nl/admin/extend/widgets.json b/public/language/nl/admin/extend/widgets.json index 69e466af86..e35e6d79dc 100644 --- a/public/language/nl/admin/extend/widgets.json +++ b/public/language/nl/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/nl/admin/settings/reputation.json b/public/language/nl/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/nl/admin/settings/reputation.json +++ b/public/language/nl/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/nl/error.json b/public/language/nl/error.json index 6da3349f1d..8a3f3d6bfc 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Sorry, je beschrijving kan niet langer zijn dan %1 karakter(s).", "cant-chat-with-yourself": "Het is niet mogelijk om met jezelf een chatgesprek te houden.", "chat-restricted": "Deze gebruiker heeft beperkingen aan de chatfunctie opgelegd waardoor deze eerst iemand moet volgen voordat deze persoon een nieuwe chat mag initiëren.", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Chat systeem uitgeschakeld", "too-many-messages": "Je hebt in korte tijd veel berichten verstuurd, als je even wacht mag je weer berichten sturen.", "invalid-chat-message": "Ongeldig bericht", diff --git a/public/language/nl/global.json b/public/language/nl/global.json index 8da73852f3..6b4c511edc 100644 --- a/public/language/nl/global.json +++ b/public/language/nl/global.json @@ -11,7 +11,7 @@ "500.message": "Oeps! Ziet er naar uit dat iets fout ging!", "400.title": "Foutief verzoek", "400.message": "It looks like this link is malformed, please double-check and try again.
Return to the home page.
", - "register": "Registeren", + "register": "Registreren", "login": "Login", "please-log-in": "Aanmelden", "logout": "Uitloggen", diff --git a/public/language/nl/modules.json b/public/language/nl/modules.json index a252352d8b..89f725497f 100644 --- a/public/language/nl/modules.json +++ b/public/language/nl/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chat met", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/nl/notifications.json b/public/language/nl/notifications.json index 5a103b7489..468dd22352 100644 --- a/public/language/nl/notifications.json +++ b/public/language/nl/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 heeft een nieuw onderwerp geplaatst: %2", "user-edited-post": "%1 heeft een bericht aangepast in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 volgt jou nu.", "user-started-following-you-dual": "%1 en %2 volgen jou nu.", @@ -75,6 +75,7 @@ "email-confirmed": "E-mailadres bevestigd", "email-confirmed-message": "Bedankt voor het bevestigen van je e-mailadres. Je account is nu volledig geactiveerd.", "email-confirm-error-message": "Er was een probleem met het bevestigen van dit e-mailadres. Misschien is de code niet goed ingevoerd of was de beschikbare tijd inmiddels verstreken.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Bevestigingsmail verstuurd.", "none": "Geen", "notification-only": "Alleen notificatie", diff --git a/public/language/nl/post-queue.json b/public/language/nl/post-queue.json index 3cbba3ebb3..c3ae526e1d 100644 --- a/public/language/nl/post-queue.json +++ b/public/language/nl/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/nl/user.json b/public/language/nl/user.json index 98daec6848..63aa6d28fc 100644 --- a/public/language/nl/user.json +++ b/public/language/nl/user.json @@ -78,6 +78,7 @@ "change-password": "Wijzig wachtwoord", "change-password-error": "Ongeldig wachtwoord!", "change-password-error-wrong-current": "Het opgegeven huidige wachtwoord is onjuist!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Het eerder opgegeven wachtwoord komt niet overeen!", "change-password-error-privileges": "Niet geautoriseerd om dit wachtwoord te mogen wijzigen.", "change-password-success": "Het wachtwoord is gewijzigd!", diff --git a/public/language/nl/users.json b/public/language/nl/users.json index eb02775a01..93c28926c2 100644 --- a/public/language/nl/users.json +++ b/public/language/nl/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Laatste gebruikers", "top-posters": "Meest actieve leden", "most-reputation": "Meeste reputatie", diff --git a/public/language/pl/admin/development/info.json b/public/language/pl/admin/development/info.json index 32667ed213..a56206ad41 100644 --- a/public/language/pl/admin/development/info.json +++ b/public/language/pl/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 maszyn odpowiedziało w ciągu %2ms!", "host": "host", - "primary": "główne / uruchomione zadania", + "primary": "podstawowe / zadania", "pid": "pid", "nodejs": "nodejs", "online": "dostępny", @@ -19,6 +19,7 @@ "registered": "Zarejestrowane", "sockets": "Sockety", + "connection-count": "Liczba połączeń", "guests": "Goście", "info": "Informacja" diff --git a/public/language/pl/admin/extend/widgets.json b/public/language/pl/admin/extend/widgets.json index 4832c1169f..1eeaf5382e 100644 --- a/public/language/pl/admin/extend/widgets.json +++ b/public/language/pl/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Karta", "container.card-header": "Nagłówek karty", "container.card-body": "Treść karty", + "container.title": "Tytuł", + "container.body": "Treść", "container.alert": "Alarm", "alert.confirm-delete": "Czy na pewno chcesz usunąć ten widget?", diff --git a/public/language/pl/admin/settings/reputation.json b/public/language/pl/admin/settings/reputation.json index ecec40614b..d4270756ae 100644 --- a/public/language/pl/admin/settings/reputation.json +++ b/public/language/pl/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Ustawienia reputacji", "disable": "Wyłącz system reputacji", "disable-down-voting": "Wyłącz system głosów przeciw", - "votes-are-public": "Wszystkie głosy są publiczne", + "upvote-visibility": "Widoczność głosów za", + "upvote-visibility-all": "Wszyscy zobaczą głosy za", + "upvote-visibility-loggedin": "Tylko zalogowani zobaczą głosy za", + "upvote-visibility-privileged": "Tylko użytkownicy jak administratorzy i moderatorzy zobaczą głosy za", + "downvote-visibility": "Widoczność głosów przeciw", + "downvote-visibility-all": "Każdy zobaczy głosy przeciw", + "downvote-visibility-loggedin": "Tylko zalogowani zobaczą głosy przeciw", + "downvote-visibility-privileged": "Tylko użytkownicy jak administratorzy i moderatorzy zobaczą głosy przeciw", "thresholds": "Progi aktywności", "min-rep-upvote": "Minimalna reputacja pozwalająca głosować za postami", "upvotes-per-day": "Limit głosów za na dzień (ustaw 0 by były nielimitowane)", diff --git a/public/language/pl/error.json b/public/language/pl/error.json index 5f4f596cbf..e24145a942 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Przepraszamy, Twój tekst „O mnie” nie może być dłuższy niż %1 znaków.", "cant-chat-with-yourself": "Nie możesz rozmawiać sam ze sobą!", "chat-restricted": "Ten użytkownik korzysta z czatu w ograniczonym zakresie. Mogą z nim rozmawiać tylko te osoby, które obserwuje.", + "chat-user-blocked": "Jesteś zablokowany(a) przez tego użytkownika.", "chat-disabled": "System rozmów jest wyłączony", "too-many-messages": "Wysłałeś zbyt wiele wiadomości, prosimy chwilę poczekać.", "invalid-chat-message": "Nieprawidłowa wiadomość", diff --git a/public/language/pl/modules.json b/public/language/pl/modules.json index 06e1de129d..3121924aa0 100644 --- a/public/language/pl/modules.json +++ b/public/language/pl/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Pokój %1", "chat.chatting-with": "Czatuj z", - "chat.placeholder": "Wpisz tutaj wiadomość, przeciągnij i opuść obrazki, wciśnij enter aby wysłać", - "chat.placeholder.mobile": "Tutaj napisz wiadomość", + "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/notifications.json b/public/language/pl/notifications.json index 093845b447..cb560d40c4 100644 --- a/public/language/pl/notifications.json +++ b/public/language/pl/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 i %3 innych dodało odpowiedzi do: %4", "user-posted-topic": "%1 stworzył nowy temat: %2", "user-edited-post": "%1 edytował post w %2", - "user-posted-topic-with-tag": "%1 stworzył nowy temat z tagiem %2", - "user-posted-topic-with-tag-dual": "%1 stworzył nowy temat z tagami %2 i %3", - "user-posted-topic-with-tag-triple": "%1 stworzył nowy temat z tagami %2, %3 i %4", - "user-posted-topic-with-tag-multiple": "%1 stworzył nowy temat z tagami %2", + "user-posted-topic-with-tag": "%1 dodał(a) %2 (tag %3)", + "user-posted-topic-with-tag-dual": "%1 dodał(a) %2 (tagi %3 i %4)", + "user-posted-topic-with-tag-triple": "%1 dodał(a) %2 (tagi %3, %4 i %5)", + "user-posted-topic-with-tag-multiple": "%1 dodał(a) %2 (tag %3)", "user-posted-topic-in-category": "%1 stworzył nowy temat w %2", "user-started-following-you": "%1 zaczął Cię obserwować.", "user-started-following-you-dual": "%1 oraz %2 zaczęli Cię obserwować.", @@ -75,6 +75,7 @@ "email-confirmed": "E-mail potwierdzony", "email-confirmed-message": "Dziękujemy za potwierdzenie maila. Twoje konto zostało aktywowane.", "email-confirm-error-message": "Wystąpił problem przy aktywacji - kod jest błędny lub przestarzały", + "email-confirm-error-message-already-validated": "Ten adres e-mail został już zweryfikowany.", "email-confirm-sent": "E-mail potwierdzający wysłany.", "none": "Żadna z opcji", "notification-only": "Tylko powiadomienie", diff --git a/public/language/pl/post-queue.json b/public/language/pl/post-queue.json index a50912d7a6..2ecc50afbf 100644 --- a/public/language/pl/post-queue.json +++ b/public/language/pl/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Usuń wybrane", "remove-selected-confirm": "Czy chcesz usunąć %1 wybranych postów?", "bulk-accept-success": "%1 postów zaakceptowanych", - "bulk-reject-success": "%1 postów odrzuconych" + "bulk-reject-success": "%1 postów odrzuconych", + "links-in-this-post": "Odnośniki w tym wpisie" } \ No newline at end of file diff --git a/public/language/pl/themes/harmony.json b/public/language/pl/themes/harmony.json index e939e1d5d6..0f207fb4fb 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": "Pokaż łącza na stronach kategorii i wątków", + "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/pl/user.json b/public/language/pl/user.json index 3a9018a475..828704d03c 100644 --- a/public/language/pl/user.json +++ b/public/language/pl/user.json @@ -78,6 +78,7 @@ "change-password": "Zmień hasło", "change-password-error": "Błędne hasło!", "change-password-error-wrong-current": "Twoje aktualne hasło nie jest poprawne!", + "change-password-error-same-password": "Nowe hasło jest identyczne co dotychczasowe. Proszę wprowadź hasło po zmianie.", "change-password-error-match": "Hasła muszą pasować!", "change-password-error-privileges": "Nie masz uprawnień do zmiany tego hasła.", "change-password-success": "Twoje hasło zostało zaktualizowane!", diff --git a/public/language/pl/users.json b/public/language/pl/users.json index 768cf44112..e89e32ff75 100644 --- a/public/language/pl/users.json +++ b/public/language/pl/users.json @@ -1,5 +1,6 @@ { "all-users": "Wszyscy użytkownicy", + "followed-users": "Śledzeni użytkownicy", "latest-users": "Nowi użytkownicy", "top-posters": "Najwięcej postów", "most-reputation": "Najwyższa reputacja", diff --git a/public/language/pt-BR/admin/admin.json b/public/language/pt-BR/admin/admin.json index 313e12bbe3..c52000cfe7 100644 --- a/public/language/pt-BR/admin/admin.json +++ b/public/language/pt-BR/admin/admin.json @@ -4,15 +4,15 @@ "acp-title": "%1 | Painel de Controle Administrativo do NodeBB", "settings-header-contents": "Conteúdos", - "changes-saved": "Changes Saved", - "changes-saved-message": "Your changes to the NodeBB configuration have been saved.", + "changes-saved": "Alterações Salvas", + "changes-saved-message": "Suas alterações na configuração do NodeBB foram salvas.", "changes-not-saved": "Alterações não foram Salvas", "changes-not-saved-message": "O NodeBB encontrou um problema ao salvar suas alterações. (%1)", - "save-changes": "Save changes", + "save-changes": "Salvar Alterações", "min": "Min:", "max": "Max:", - "view": "View", - "edit": "Edit", - "add": "Add", - "select-icon": "Select Icon" + "view": "Visualizar", + "edit": "Editar", + "add": "Adicionar", + "select-icon": "Selecionar Ícone" } \ No newline at end of file diff --git a/public/language/pt-BR/admin/development/info.json b/public/language/pt-BR/admin/development/info.json index e1a5b6b618..e0fabb3ddb 100644 --- a/public/language/pt-BR/admin/development/info.json +++ b/public/language/pt-BR/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes respondidos dentro de %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registrado", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Visitantes", "info": "Informação" diff --git a/public/language/pt-BR/admin/extend/widgets.json b/public/language/pt-BR/admin/extend/widgets.json index 5d0101f4b2..696246edd8 100644 --- a/public/language/pt-BR/admin/extend/widgets.json +++ b/public/language/pt-BR/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alerta", "alert.confirm-delete": "Tem certeza de que deseja excluir este widget?", diff --git a/public/language/pt-BR/admin/settings/reputation.json b/public/language/pt-BR/admin/settings/reputation.json index 0b59ee90a0..387124d0e4 100644 --- a/public/language/pt-BR/admin/settings/reputation.json +++ b/public/language/pt-BR/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Configurações de Reputação", "disable": "Desabilitar o Sistema de Reputação", "disable-down-voting": "Desativar a Negativação", - "votes-are-public": "Todos os Votos São Públicos", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Limites às atividades", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/pt-BR/category.json b/public/language/pt-BR/category.json index f2badb6332..bad6452df6 100644 --- a/public/language/pt-BR/category.json +++ b/public/language/pt-BR/category.json @@ -10,15 +10,15 @@ "watch": "Acompanhar", "ignore": "Ignorar", "watching": "Acompanhar", - "tracking": "Tracking", + "tracking": "Rastreando", "not-watching": "Não Acompanhar", "ignoring": "Ignorar", - "watching.description": "Notify me of new topics.
Show topics in unread & recent", - "tracking.description": "Shows topics in unread & recent", + "watching.description": "Me notificar de novas respostas.Mostrar tópico em não-lidos.", + "tracking.description": "Mostrar tópicos em não-lidos e recentes", "not-watching.description": "Não mostrar tópicos em não-lidos, mostrar em recentes", - "ignoring.description": "Do not show topics in unread & recent", + "ignoring.description": "Não mostrar tópicos em \"não lidos\" e \"recentes\"", "watching.message": "Agora, você está acompanhando as novidades desta categoria e todas as suas subcategorias", - "tracking.message": "You are now tracking updates from this category and all subcategories", + "tracking.message": "Agora, você está acompanhando as novidades desta categoria e todas as suas subcategorias", "notwatching.message": "Agora, você não está acompanhando as novidades nem desta categoria e nem de suas subcategorias", "ignoring.message": "Agora, você está ignorando as novidades desta categorias e de todas as suas subcategorias", "watched-categories": "Categorias acompanhadas", diff --git a/public/language/pt-BR/error.json b/public/language/pt-BR/error.json index 4b8c0fb840..4bff6874c9 100644 --- a/public/language/pt-BR/error.json +++ b/public/language/pt-BR/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Desculpe, o sobre não pode ser maior que %1 caractere(s).", "cant-chat-with-yourself": "Você não pode iniciar um chat consigo mesmo!", "chat-restricted": "Este usuário restringiu suas mensagens de chat. Eles devem seguir você antes que você possa conversar com eles", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "O sistema de chat foi desabilitado", "too-many-messages": "Você enviou muitas mensagens, por favor aguarde um momento.", "invalid-chat-message": "Mensagem de chat inválida", diff --git a/public/language/pt-BR/modules.json b/public/language/pt-BR/modules.json index 3d803930c0..26eb190f69 100644 --- a/public/language/pt-BR/modules.json +++ b/public/language/pt-BR/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Conversar com", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/pt-BR/notifications.json b/public/language/pt-BR/notifications.json index b310b45bce..5c24e081f8 100644 --- a/public/language/pt-BR/notifications.json +++ b/public/language/pt-BR/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 postou um novo tópico: %2", "user-edited-post": "%1 editou um post em %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 começou a seguir você.", "user-started-following-you-dual": "%1 e %2 começaram a lhe acompanhar.", @@ -75,6 +75,7 @@ "email-confirmed": "Email Confirmado", "email-confirmed-message": "Obrigado por validar o seu email. Agora sua conta está plenamente ativada.", "email-confirm-error-message": "Houve um problema ao validar o seu endereço de email. Talvez o código era invalido ou tenha expirado.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Email de confirmação enviado.", "none": "Nenhum", "notification-only": "Apenas Notificações", diff --git a/public/language/pt-BR/post-queue.json b/public/language/pt-BR/post-queue.json index 795ee1c8dc..7b6c12f7d7 100644 --- a/public/language/pt-BR/post-queue.json +++ b/public/language/pt-BR/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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-BR/topic.json b/public/language/pt-BR/topic.json index 5413887db1..1bf116660c 100644 --- a/public/language/pt-BR/topic.json +++ b/public/language/pt-BR/topic.json @@ -15,14 +15,14 @@ "replies-to-this-post": "%1 Respostas", "one-reply-to-this-post": "1 Resposta", "last-reply-time": "Última resposta", - "reply-options": "Reply options", + "reply-options": "Opções de resposta", "reply-as-topic": "Responder como tópico", "guest-login-reply": "Entre para responder", "login-to-view": "🔒 Entre para ver", "edit": "Editar", "delete": "Deletar", - "delete-event": "Delete Event", - "delete-event-confirm": "Are you sure you want to delete this event?", + "delete-event": "Deletar Evento", + "delete-event-confirm": "Tem certeza que deseja deletar este evento?", "purge": "Expurgar", "restore": "Restaurar", "move": "Mover", @@ -38,42 +38,42 @@ "deleted": "Deleted", "moved": "Movido", "moved-from": "Movido de %1", - "copy-code": "Copy Code", + "copy-code": "Copiar Código", "copy-ip": "Copiar IP", "ban-ip": "Banir IP", "view-history": "Histórico de Edição", - "wrote-ago": "wrote ", - "wrote-on": "wrote on ", - "replied-to-user-ago": "replied to %3 ", - "replied-to-user-on": "replied to %3 on ", - "user-locked-topic-ago": "%1 locked this topic %2", - "user-locked-topic-on": "%1 locked this topic on %2", - "user-unlocked-topic-ago": "%1 unlocked this topic %2", - "user-unlocked-topic-on": "%1 unlocked this topic on %2", - "user-pinned-topic-ago": "%1 pinned this topic %2", - "user-pinned-topic-on": "%1 pinned this topic on %2", - "user-unpinned-topic-ago": "%1 unpinned this topic %2", - "user-unpinned-topic-on": "%1 unpinned this topic on %2", - "user-deleted-topic-ago": "%1 deleted this topic %2", - "user-deleted-topic-on": "%1 deleted this topic on %2", - "user-restored-topic-ago": "%1 restored this topic %2", - "user-restored-topic-on": "%1 restored this topic on %2", - "user-moved-topic-from-ago": "%1 moved this topic from %2 %3", - "user-moved-topic-from-on": "%1 moved this topic from %2 on %3", - "user-queued-post-ago": "%1 queued post for approval %3", - "user-queued-post-on": "%1 queued post for approval on %3", - "user-referenced-topic-ago": "%1 referenced this topic %3", - "user-referenced-topic-on": "%1 referenced this topic on %3", - "user-forked-topic-ago": "%1 forked this topic %3", - "user-forked-topic-on": "%1 forked this topic on %3", + "wrote-ago": "escreveu ", + "wrote-on": "escreveu em ", + "replied-to-user-ago": "respondeu para %3 ", + "replied-to-user-on": "respondeu para %3 on ", + "user-locked-topic-ago": "%1 trancou este tópico %2", + "user-locked-topic-on": "%1 trancou este tópico em %2", + "user-unlocked-topic-ago": "%1 destrancou este tópico %2", + "user-unlocked-topic-on": "%1 destrancou este tópico em %2", + "user-pinned-topic-ago": "%1 fixou este tópico %2", + "user-pinned-topic-on": "%1 fixou este tópico em %2", + "user-unpinned-topic-ago": "%1 desfixou este tópico %2", + "user-unpinned-topic-on": "%1 desfixou este tópico em %2", + "user-deleted-topic-ago": "%1 deletou este tópico %2", + "user-deleted-topic-on": "%1 deletou este tópico em %2", + "user-restored-topic-ago": "%1 restaurou este tópico %2", + "user-restored-topic-on": "%1 restaurou este tópico em %2", + "user-moved-topic-from-ago": "%1 moveu este tópico de %2 %3", + "user-moved-topic-from-on": "%1 moveu este tópico de %2 em %3", + "user-queued-post-ago": "%1 enfileirou post para aprovação %3", + "user-queued-post-on": "%1 enfileirou post para aprovação em %3", + "user-referenced-topic-ago": "%1 referenciou este tópico %3", + "user-referenced-topic-on": "%1 referenciou este tópico em %3", + "user-forked-topic-ago": "%1 ramificou este tópico %3", + "user-forked-topic-on": "%1 ramificou este tópico em %3", "bookmark-instructions": "Clique aqui para retornar ao último post lido neste tópico.", "flag-post": "Marque este post", "flag-user": "Marque este usuário", "already-flagged": "Já marcado", "view-flag-report": "Ver Relatório da Sinalização", "resolve-flag": "Resolver marcação", - "merged-message": "Este tópico foi fundido com %2", - "forked-message": "This topic was forked from %2", + "merged-message": "Este tópico foi mesclado com %2", + "forked-message": "Este tópico foi ramificado de %2", "deleted-message": "Este tópico foi deletado. Apenas usuários com privilégios de moderação de tópico podem vê-lo.", "following-topic.message": "Agora você receberá notificações quando alguém responder este tópico.", "not-following-topic.message": "Você verá este tópico na lista de tópicos não-lidos, mas você não receberá notificações quando alguém postar no tópico.", @@ -105,7 +105,7 @@ "thread-tools.change-owner": "Trocar proprietário", "thread-tools.select-category": "Escolha a Categoria", "thread-tools.fork": "Ramificar Tópico", - "thread-tools.tag": "Tag Topic", + "thread-tools.tag": "Definir Tag", "thread-tools.delete": "Deletar Tópico", "thread-tools.delete-posts": "Deletar Posts", "thread-tools.delete-confirm": "Tem certeza que deseja excluir este tópico?", @@ -114,7 +114,7 @@ "thread-tools.purge": "Expurgar Tópico", "thread-tools.purge-confirm": "Tem certeza que deseja expurgar este tópico?", "thread-tools.merge-topics": "Mesclar Tópicos", - "thread-tools.merge": "Merge Topic", + "thread-tools.merge": "Mesclar Tópico", "topic-move-success": "Este tópico será movido para '% 1' em breve. Clique aqui para desfazer.", "topic-move-multiple-success": "Esses tópicos serão movidos para '%1' em breve. Clique aqui para desfazer.", "topic-move-all-success": "Todos os tópicos serão movidos para '%1' em breve. Clique aqui para desfazer.", @@ -132,7 +132,7 @@ "bookmark": "Favorito", "bookmarks": "Favoritos", "bookmarks.has-no-bookmarks": "Você ainda não adicionou quaisquer posts aos favoritos.", - "copy-permalink": "Copy Permalink", + "copy-permalink": "Copiar Permalink", "loading-more-posts": "Carregando Mais Posts", "move-topic": "Mover Tópico", "move-topics": "Mover Tópicos", @@ -140,7 +140,7 @@ "post-moved": "Post movido!", "fork-topic": "Ramificar Tópico", "enter-new-topic-title": "Insira o novo título do tópico", - "fork-topic-instruction": "Click the posts you want to fork, enter a title for the new topic and click fork topic", + "fork-topic-instruction": "Click nos posts que você quer ramificar, entre um novo título para o novo tópico e click em ramificar tópico", "fork-no-pids": "Nenhum post selecionado!", "no-posts-selected": "Nenhum post selecionado!", "x-posts-selected": "%1 post(s) selecionados", @@ -155,19 +155,19 @@ "merge-new-title-for-topic": "Novo título para o tópico", "topic-id": "ID do Tópico", "move-posts-instruction": "Clique nas postagens que deseja mover e insira um ID de tópico ou vá para o tópico de destino", - "move-topic-instruction": "Select the target category and then click move", + "move-topic-instruction": "Selecione a categoria destino e click em mover", "change-owner-instruction": "Clique na postagem que você quer associar a outro usuário", "composer.title-placeholder": "Digite aqui o título para o seu tópico...", "composer.handle-placeholder": "Digite seu nome/usuário aqui", - "composer.hide": "Hide", + "composer.hide": "Esconder", "composer.discard": "Descartar", "composer.submit": "Enviar", - "composer.additional-options": "Additional Options", - "composer.post-later": "Post Later", + "composer.additional-options": "Opções Adicionais", + "composer.post-later": "Postar mais tarde", "composer.schedule": "Agendar", "composer.replying-to": "Respondendo para %1", "composer.new-topic": "Novo Tópico", - "composer.editing-in": "Editing post in %1", + "composer.editing-in": "Editando post em %1", "composer.uploading": "enviando...", "composer.thumb-url-label": "Cole o endereço de um thumbnail para o tópico", "composer.thumb-title": "Adicionar um thumbnail para este tópico", @@ -186,7 +186,7 @@ "recently-created": "Recently Created", "most-votes": "Mais Votados", "most-posts": "Mais Postagens", - "most-views": "Most Views", + "most-views": "Mais Views", "stale.title": "Criar um novo tópico ao invés disso?", "stale.warning": "O tópico que você está respondendo é bem antigo. Você gostaria de criar um novo tópico ao invés disso, e referenciá-lo em sua resposta?", "stale.create": "Criar um novo tópico", @@ -206,12 +206,12 @@ "timeago-earlier": "%1 mais cedo", "first-post": "Primeiro post", "last-post": "Último post", - "go-to-my-next-post": "Go to my next post", - "no-more-next-post": "You don't have more posts in this topic", + "go-to-my-next-post": "Ir para o meu próximo post", + "no-more-next-post": "Você não tem mais posts nesse tópico", "open-composer": "Open composer", "post-quick-reply": "Resposta rápida", - "navigator.index": "Post %1 of %2", - "navigator.unread": "%1 unread", + "navigator.index": "Post %1 de %2", + "navigator.unread": "%1 não lida", "upvote-post": "Upvote post", "downvote-post": "Downvote post", "post-tools": "Post tools", diff --git a/public/language/pt-BR/user.json b/public/language/pt-BR/user.json index 07e8be4f25..893c32866b 100644 --- a/public/language/pt-BR/user.json +++ b/public/language/pt-BR/user.json @@ -78,6 +78,7 @@ "change-password": "Alterar Senha", "change-password-error": "Senha Inválida!", "change-password-error-wrong-current": "Sua senha atual está incorreta!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "As senhas devem conferir!", "change-password-error-privileges": "Você não possui permissões para alterar esta senha.", "change-password-success": "Sua senha foi alterada!", diff --git a/public/language/pt-BR/users.json b/public/language/pt-BR/users.json index 282fb46d5e..19ba354d54 100644 --- a/public/language/pt-BR/users.json +++ b/public/language/pt-BR/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Últimos Usuários", "top-posters": "Principais Participantes", "most-reputation": "Maior Reputação", diff --git a/public/language/pt-PT/admin/development/info.json b/public/language/pt-PT/admin/development/info.json index e88ef6e50d..9dc6b6665e 100644 --- a/public/language/pt-PT/admin/development/info.json +++ b/public/language/pt-PT/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nós responderam dentro de %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registados", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Convidados", "info": "Informação" diff --git a/public/language/pt-PT/admin/extend/widgets.json b/public/language/pt-PT/admin/extend/widgets.json index f3c1c84836..dc5e4376ee 100644 --- a/public/language/pt-PT/admin/extend/widgets.json +++ b/public/language/pt-PT/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Tens a certeza que desejas eliminar este widget?", diff --git a/public/language/pt-PT/admin/settings/reputation.json b/public/language/pt-PT/admin/settings/reputation.json index c417c4a61d..845c51d9cb 100644 --- a/public/language/pt-PT/admin/settings/reputation.json +++ b/public/language/pt-PT/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Definições de Reputação", "disable": "Desativar Sistema de Reputação", "disable-down-voting": "Desativar Votos Negativos", - "votes-are-public": "Todos os Votos São Públicos", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Limites de Atividade", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/pt-PT/error.json b/public/language/pt-PT/error.json index 4cb33961d2..0cbc6c2f40 100644 --- a/public/language/pt-PT/error.json +++ b/public/language/pt-PT/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Desculpa, o teu \"sobre mim\" não pode ser superior a %1 caracter(es).", "cant-chat-with-yourself": "Não podes conversar contigo mesmo!", "chat-restricted": "Este utilizador colocou restrições sobre as suas mensagens de chat. Ele deve primeiro seguir-te antes que possas conversar com ele", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Sistema de conversas desativado", "too-many-messages": "Enviaste demasiadas mensagens, por favor espera um pouco.", "invalid-chat-message": "Mensagem de chat inválida", diff --git a/public/language/pt-PT/modules.json b/public/language/pt-PT/modules.json index 72f2a10f89..367ef43725 100644 --- a/public/language/pt-PT/modules.json +++ b/public/language/pt-PT/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Conversar com", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/pt-PT/notifications.json b/public/language/pt-PT/notifications.json index 8f4e18c6f2..dffeacc756 100644 --- a/public/language/pt-PT/notifications.json +++ b/public/language/pt-PT/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 publicou um novo tópico: %2", "user-edited-post": "%1 editou uma publicação em %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 começou a seguir-te.", "user-started-following-you-dual": "%1 e %2 começaram a seguir-te.", @@ -75,6 +75,7 @@ "email-confirmed": "E-mail confirmado", "email-confirmed-message": "Obrigado por validares o teu endereço de e-mail. A tua conta está agora totalmente ativa.", "email-confirm-error-message": "Ocorreu um problema a validar o teu endereço de e-mail. Talvez o código seja inválido ou já tenha expirado.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "E-mail de confirmação enviado.", "none": "Nada", "notification-only": "Apenas Notificação", diff --git a/public/language/pt-PT/post-queue.json b/public/language/pt-PT/post-queue.json index d02245963e..3a4ce53316 100644 --- a/public/language/pt-PT/post-queue.json +++ b/public/language/pt-PT/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/pt-PT/user.json b/public/language/pt-PT/user.json index cc5f1654ba..8fb2e3a523 100644 --- a/public/language/pt-PT/user.json +++ b/public/language/pt-PT/user.json @@ -78,6 +78,7 @@ "change-password": "Palavra-passe alterada", "change-password-error": "Palavra-passe Inválida!", "change-password-error-wrong-current": "A tua palavra-passe atual não está correta!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "As palavras-passe devem coincidir!", "change-password-error-privileges": "Não tens os direitos necessários para alterar esta palavra-passe.", "change-password-success": "A tua palavra-passe foi atualizada!", diff --git a/public/language/pt-PT/users.json b/public/language/pt-PT/users.json index 1e16097101..fa138eb1a1 100644 --- a/public/language/pt-PT/users.json +++ b/public/language/pt-PT/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Utilizadores Recentes", "top-posters": "Top de publicadores", "most-reputation": "Maior Reputação", diff --git a/public/language/ro/admin/development/info.json b/public/language/ro/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/ro/admin/development/info.json +++ b/public/language/ro/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/ro/admin/extend/widgets.json b/public/language/ro/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/ro/admin/extend/widgets.json +++ b/public/language/ro/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/ro/admin/settings/reputation.json b/public/language/ro/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/ro/admin/settings/reputation.json +++ b/public/language/ro/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/ro/error.json b/public/language/ro/error.json index 1307ed9b4f..8f6974f87b 100644 --- a/public/language/ro/error.json +++ b/public/language/ro/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).", "cant-chat-with-yourself": "Nu poți conversa cu tine!", "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/ro/modules.json b/public/language/ro/modules.json index 39a9da3cd2..c637d7e8bb 100644 --- a/public/language/ro/modules.json +++ b/public/language/ro/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chat with", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/ro/notifications.json b/public/language/ro/notifications.json index daa30b04d8..a4d0e1ecde 100644 --- a/public/language/ro/notifications.json +++ b/public/language/ro/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 has posted a new topic: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 a început să te urmărească.", "user-started-following-you-dual": "%1 and %2 started following you.", @@ -75,6 +75,7 @@ "email-confirmed": "Email confirmat", "email-confirmed-message": "Îți mulțumim pentru validarea emailului. Contul tău este acuma activat.", "email-confirm-error-message": "A fost o problemă cu activarea adresei tale de email. Poate codul de activare a fost invalid sau expirat.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Un email de confirmare a fost trimis.", "none": "None", "notification-only": "Notification Only", diff --git a/public/language/ro/post-queue.json b/public/language/ro/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/ro/post-queue.json +++ b/public/language/ro/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/ro/user.json b/public/language/ro/user.json index 1eb8ceb61d..e5a719d8ef 100644 --- a/public/language/ro/user.json +++ b/public/language/ro/user.json @@ -78,6 +78,7 @@ "change-password": "Schimbă Parola", "change-password-error": "Parola invalidă!", "change-password-error-wrong-current": "Parola ta curentă nu este corectă!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Parolele trebuie să se potrivească!", "change-password-error-privileges": "Nu ai nici un drept să schimbi această parolă.", "change-password-success": "Parola ta a fost actualizată!", diff --git a/public/language/ro/users.json b/public/language/ro/users.json index 614f7160eb..fd6c6a6c58 100644 --- a/public/language/ro/users.json +++ b/public/language/ro/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Ultimii Utilizatori", "top-posters": "Top Utilizatori", "most-reputation": "Cei mai apreciați utilizatori", diff --git a/public/language/ru/admin/development/info.json b/public/language/ru/admin/development/info.json index 63d6faae67..a7f1481f88 100644 --- a/public/language/ru/admin/development/info.json +++ b/public/language/ru/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "Узлов: %1. Время ответа %2мс!", "host": "хост", - "primary": "первичный", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "онлайн", @@ -19,6 +19,7 @@ "registered": "Авторизованных", "sockets": "Сокеты", + "connection-count": "Connection Count", "guests": "Гостей", "info": "Сырые данные" diff --git a/public/language/ru/admin/extend/widgets.json b/public/language/ru/admin/extend/widgets.json index f6df2ce5aa..f4618d3066 100644 --- a/public/language/ru/admin/extend/widgets.json +++ b/public/language/ru/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Уведомление", "alert.confirm-delete": "Вы уверены, что хотите удалить этот виджет?", diff --git a/public/language/ru/admin/settings/post.json b/public/language/ru/admin/settings/post.json index cc80f8805f..4b6f3b5f76 100644 --- a/public/language/ru/admin/settings/post.json +++ b/public/language/ru/admin/settings/post.json @@ -4,11 +4,11 @@ "sorting.post-default": "Стандартная сортировка сообщений", "sorting.oldest-to-newest": "Сначала старые", "sorting.newest-to-oldest": "Сначала новые", - "sorting.recently-replied": "Recently Replied", - "sorting.recently-created": "Recently Created", + "sorting.recently-replied": "Недавно ответили", + "sorting.recently-created": "Недавно создано", "sorting.most-votes": "По количеству голосов", "sorting.most-posts": "По количеству сообщений", - "sorting.most-views": "Most Views", + "sorting.most-views": "Наибольшее количество просмотров", "sorting.topic-default": "Стандартная сортировка тем", "length": "Длина сообщения", "post-queue": "Очередь на публикацию", diff --git a/public/language/ru/admin/settings/reputation.json b/public/language/ru/admin/settings/reputation.json index 01fced0def..fe8b8e2807 100644 --- a/public/language/ru/admin/settings/reputation.json +++ b/public/language/ru/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Настройка системы репутации", "disable": "Выключить отслеживание репутации", "disable-down-voting": "Отключить понижение рейтинга", - "votes-are-public": "Все голоса общедоступны", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Пороговые значения", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/ru/error.json b/public/language/ru/error.json index 500d5ba740..f79b87f63e 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Пожалуйста, постарайтесь уложиться в поле \"О себе\" в %1 символов.", "cant-chat-with-yourself": "Вы не можете создать чат с самим собой!", "chat-restricted": "Пользователь ограничил приём сообщений. Чтобы написать ему личное сообщение, необходимо, чтобы он был подписан на вас.", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Чат выключен", "too-many-messages": "Вы отправили слишком много сообщений, подождите немного.", "invalid-chat-message": "Некорректное сообщение чата", diff --git a/public/language/ru/modules.json b/public/language/ru/modules.json index 0519451b3c..fe0dcb2f7e 100644 --- a/public/language/ru/modules.json +++ b/public/language/ru/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Чат с", - "chat.placeholder": "Введите сообщение, перетащите изображения, нажмите enter для отправки", - "chat.placeholder.mobile": "Введите сообщение здесь", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 пользователей и %2 других", "chat.chat-with-usernames": "Чат с %1", diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json index c24ff5f7ff..3dd958a19d 100644 --- a/public/language/ru/notifications.json +++ b/public/language/ru/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "Пользователь %1 создал новую тему: %2", "user-edited-post": " %1 отредактировал сообщение в %2 ", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "Пользователь %1 подписался на вас.", "user-started-following-you-dual": "Пользователи %1 и %2 подписались на вас.", @@ -75,6 +75,7 @@ "email-confirmed": "Электронная почта подтверждена", "email-confirmed-message": "Спасибо за подтверждение адреса электронной почты. Ваша учётная запись активирована.", "email-confirm-error-message": "Ошибка проверки адреса электронной почты. Возможно, код подтверждения введён неправильно или у него истёк срок действия.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Письмо с проверочным кодом отправлено на ваш электронный адрес", "none": "Ничего", "notification-only": "Только уведомление", diff --git a/public/language/ru/post-queue.json b/public/language/ru/post-queue.json index 991b447759..eab4436f1f 100644 --- a/public/language/ru/post-queue.json +++ b/public/language/ru/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Удалить выделенное", "remove-selected-confirm": "Вы хотите удалить %1 выбранные записи?", "bulk-accept-success": "%1 записи одобрены", - "bulk-reject-success": "%1 записи отклонены" + "bulk-reject-success": "%1 записи отклонены", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/ru/user.json b/public/language/ru/user.json index 309cd62e5c..2fe2f1ef34 100644 --- a/public/language/ru/user.json +++ b/public/language/ru/user.json @@ -78,6 +78,7 @@ "change-password": "Изменить пароль", "change-password-error": "Неправильный пароль!", "change-password-error-wrong-current": "Текущий пароль указан неверно!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Пароли должны совпадать!", "change-password-error-privileges": "Вы не можете изменить пароль.", "change-password-success": "Ваш пароль изменён!", diff --git a/public/language/ru/users.json b/public/language/ru/users.json index 68e0e0b7e1..33982ab352 100644 --- a/public/language/ru/users.json +++ b/public/language/ru/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Новые пользователи", "top-posters": "Самые активные", "most-reputation": "Лучшая репутация", diff --git a/public/language/rw/admin/development/info.json b/public/language/rw/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/rw/admin/development/info.json +++ b/public/language/rw/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/rw/admin/extend/widgets.json b/public/language/rw/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/rw/admin/extend/widgets.json +++ b/public/language/rw/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/rw/admin/settings/reputation.json b/public/language/rw/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/rw/admin/settings/reputation.json +++ b/public/language/rw/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/rw/error.json b/public/language/rw/error.json index ab18e12bdb..b1f6b9290f 100644 --- a/public/language/rw/error.json +++ b/public/language/rw/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Inshamake y'Ubuzima yawe ntiyemerewe kurenza inyuguti (cyangwa ibimenyetso) %1.", "cant-chat-with-yourself": "Ntabwo wakwiganiriza!", "chat-restricted": "Uyu muntu yemerera kuganirira mu gikari n'abantu bamwe na bamwe. Agomba kuba yarahisemo kugukurikira kugirango ube wabasha kumuganiriza uciye mu gikari.", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Chat system disabled", "too-many-messages": "Wohereje ubutumwa bwinshi cyane. Ba utegerejeho gato.", "invalid-chat-message": "Invalid chat message", diff --git a/public/language/rw/modules.json b/public/language/rw/modules.json index 5f531d7b66..6181e328f2 100644 --- a/public/language/rw/modules.json +++ b/public/language/rw/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chat with", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/rw/notifications.json b/public/language/rw/notifications.json index 94aef14349..8804f83529 100644 --- a/public/language/rw/notifications.json +++ b/public/language/rw/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 yatangije ikiganiro gishya: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 yatangiye kugukurikira.", "user-started-following-you-dual": "%1 and %2 started following you.", @@ -75,6 +75,7 @@ "email-confirmed": "Email Yemejwe", "email-confirmed-message": "Urakoze kugaragaza ko email yawe ikora. Ubu ngubu konte yawe irakora nta kabuza.", "email-confirm-error-message": "Havutse ikibazo mu gushaka kumenya niba email yawe ikora. Ushobora kuba wakoresheje kode itari yo cyangwa se yarengeje igihe.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Hoherejwe email yo kubyemeza.", "none": "None", "notification-only": "Notification Only", diff --git a/public/language/rw/post-queue.json b/public/language/rw/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/rw/post-queue.json +++ b/public/language/rw/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/rw/user.json b/public/language/rw/user.json index bacfa18089..3f475cdb23 100644 --- a/public/language/rw/user.json +++ b/public/language/rw/user.json @@ -78,6 +78,7 @@ "change-password": "Hindura Ijambobanga", "change-password-error": "Ijambobanga Ritari Ryo!", "change-password-error-wrong-current": "Ijambobanga ryawe watanze nk'irisanzweho ntabwo ari ryo!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Ijambobanga ugomba kuryandukura mu buryo bumwe inshuro ebyiri!", "change-password-error-privileges": "Nta burenganzira ufite bwo guhindura iri jambobanga.", "change-password-success": "Ijambobanga ryawe ryavuguruwe!", diff --git a/public/language/rw/users.json b/public/language/rw/users.json index 5dca0e9e97..e26b0fa4ae 100644 --- a/public/language/rw/users.json +++ b/public/language/rw/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Abantu Bashya", "top-posters": "Abashyizeho Byinshi", "most-reputation": "Abafite Amanota Menshi", diff --git a/public/language/sc/admin/development/info.json b/public/language/sc/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/sc/admin/development/info.json +++ b/public/language/sc/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/sc/admin/extend/widgets.json b/public/language/sc/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/sc/admin/extend/widgets.json +++ b/public/language/sc/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/sc/admin/settings/reputation.json b/public/language/sc/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/sc/admin/settings/reputation.json +++ b/public/language/sc/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/sc/error.json b/public/language/sc/error.json index f12e15c94f..674f9bec8b 100644 --- a/public/language/sc/error.json +++ b/public/language/sc/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Sorry, your about me cannot be longer than %1 character(s).", "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/sc/modules.json b/public/language/sc/modules.json index 00e8a42142..b01c92446b 100644 --- a/public/language/sc/modules.json +++ b/public/language/sc/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chat with", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/sc/notifications.json b/public/language/sc/notifications.json index a1d860076a..4348eb1bfe 100644 --- a/public/language/sc/notifications.json +++ b/public/language/sc/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 has posted a new topic: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 started following you.", "user-started-following-you-dual": "%1 and %2 started following you.", @@ -75,6 +75,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", "notification-only": "Notification Only", diff --git a/public/language/sc/post-queue.json b/public/language/sc/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/sc/post-queue.json +++ b/public/language/sc/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/sc/user.json b/public/language/sc/user.json index 8bcc7db6ca..9be7780a83 100644 --- a/public/language/sc/user.json +++ b/public/language/sc/user.json @@ -78,6 +78,7 @@ "change-password": "Muda 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/sc/users.json b/public/language/sc/users.json index 035176aa4d..57a5f5c15f 100644 --- a/public/language/sc/users.json +++ b/public/language/sc/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Ùrtimos Impitadores", "top-posters": "Prus Ativos", "most-reputation": "Prus Famados", diff --git a/public/language/sk/admin/development/info.json b/public/language/sk/admin/development/info.json index 62f5cb9863..c6dbfd349e 100644 --- a/public/language/sk/admin/development/info.json +++ b/public/language/sk/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 väzieb odpovedalo počas %2ms.", "host": "hosť", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "pripojený", @@ -19,6 +19,7 @@ "registered": "Registrovaný", "sockets": "Sockety", + "connection-count": "Connection Count", "guests": "Hostia", "info": "Informácie" diff --git a/public/language/sk/admin/extend/widgets.json b/public/language/sk/admin/extend/widgets.json index fdb09c542c..4c86a0225c 100644 --- a/public/language/sk/admin/extend/widgets.json +++ b/public/language/sk/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Upozornenie", "alert.confirm-delete": "Ste si istý že chcete zmazať túto miniaplikáciu?", diff --git a/public/language/sk/admin/settings/reputation.json b/public/language/sk/admin/settings/reputation.json index 69ef3fad85..b713f2292d 100644 --- a/public/language/sk/admin/settings/reputation.json +++ b/public/language/sk/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Nastavenie reputácie", "disable": "Zakázať systém reputácie", "disable-down-voting": "Zakázať hlasovanie", - "votes-are-public": "Všetky hlasovania sú verejné", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Obmedzenie aktivity", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/sk/error.json b/public/language/sk/error.json index ca5bfff09a..52f1beddd2 100644 --- a/public/language/sk/error.json +++ b/public/language/sk/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Prepáčte, ale Vaše 'O mne' nemôže byť dlhšie ako %1 znaky(ov).", "cant-chat-with-yourself": "Nemôžete sa rozprávať so samým sebou!", "chat-restricted": "Tento používateľ obmedzil svoje správy v konverzácií. Musí Vás sledovať, aby ste sa s ním mohli rozprávať", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Systém konverzácií je zablokovaný", "too-many-messages": "Odoslali ste príliš veľa správ, počkajte chvíľu prosím.", "invalid-chat-message": "Neplatná správa konverzácie", diff --git a/public/language/sk/modules.json b/public/language/sk/modules.json index 76abdaac69..1070b9f944 100644 --- a/public/language/sk/modules.json +++ b/public/language/sk/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Konverzácia s", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/sk/notifications.json b/public/language/sk/notifications.json index de66fd4959..2ff5c2fe6f 100644 --- a/public/language/sk/notifications.json +++ b/public/language/sk/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 pridal novú tému: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 Vás začal sledovať.", "user-started-following-you-dual": "%1 a %2 Vás začali sledovať.", @@ -75,6 +75,7 @@ "email-confirmed": "E-mail bol potvrdený", "email-confirmed-message": "Ďakujeme za potvrdenie Vášho e-mailu. Váš účet je teraz aktivovaný.", "email-confirm-error-message": "Vyskytla sa chyba pri overení Vašej e-mailovej adresy.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Potvrdzovací e-mail bol odoslaný.", "none": "Nič", "notification-only": "Iba oznámenia", diff --git a/public/language/sk/post-queue.json b/public/language/sk/post-queue.json index ff8a841770..e39c5428d5 100644 --- a/public/language/sk/post-queue.json +++ b/public/language/sk/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/sk/user.json b/public/language/sk/user.json index d20fa88acd..954481bb46 100644 --- a/public/language/sk/user.json +++ b/public/language/sk/user.json @@ -78,6 +78,7 @@ "change-password": "Zmeniť heslo", "change-password-error": "Nesprávne heslo!", "change-password-error-wrong-current": "Vaše súčasné heslo nie je správne", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Heslá sa musia zhodovať!", "change-password-error-privileges": "Nemáte práva na zmenu hesla.", "change-password-success": "Vaše heslo je aktualizované.", diff --git a/public/language/sk/users.json b/public/language/sk/users.json index 8c94039b7a..a763f4b1d3 100644 --- a/public/language/sk/users.json +++ b/public/language/sk/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Najnovší používatelia", "top-posters": "Najaktívnejší", "most-reputation": "Najváženejší", diff --git a/public/language/sl/admin/development/info.json b/public/language/sl/admin/development/info.json index 4c469cc598..f53089170f 100644 --- a/public/language/sl/admin/development/info.json +++ b/public/language/sl/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 vozlišč se je odzvalo v %2ms!", "host": "gostitelj", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "na spletu", @@ -19,6 +19,7 @@ "registered": "Registrirani", "sockets": "Vtičnice", + "connection-count": "Connection Count", "guests": "Gostje", "info": "Info" diff --git a/public/language/sl/admin/extend/widgets.json b/public/language/sl/admin/extend/widgets.json index f05bbacafe..8774ef80e1 100644 --- a/public/language/sl/admin/extend/widgets.json +++ b/public/language/sl/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Opozorilo", "alert.confirm-delete": "Ste prepričani, da želite izbrisati ta pripomoček?", diff --git a/public/language/sl/admin/settings/reputation.json b/public/language/sl/admin/settings/reputation.json index fff75edb9f..56408e4823 100644 --- a/public/language/sl/admin/settings/reputation.json +++ b/public/language/sl/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Nastavitve ugleda", "disable": "Onemogoči sistem ugleda", "disable-down-voting": "Onemogoči glasovanje proti", - "votes-are-public": "Vsi glasovi so javni", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/sl/error.json b/public/language/sl/error.json index 3b9a8bb15e..c55a6e4804 100644 --- a/public/language/sl/error.json +++ b/public/language/sl/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Rubrika O meni je predolga. Največje število znakov: %1.", "cant-chat-with-yourself": "Ne morete klepetati s seboj!", "chat-restricted": "Uporabnik je omejil klepetanje. Za možnost klepeta vas mora uporabnik spremljati.", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Klepet je onemogočen.", "too-many-messages": "Poslali ste preveč sporočil, prosimo, počakajte nekaj časa.", "invalid-chat-message": "Neveljavno sporočilo klepeta", diff --git a/public/language/sl/modules.json b/public/language/sl/modules.json index a95028d95f..a15faa5681 100644 --- a/public/language/sl/modules.json +++ b/public/language/sl/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Klepetajte z", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/sl/notifications.json b/public/language/sl/notifications.json index 2f8f6337f3..11c3b0bd56 100644 --- a/public/language/sl/notifications.json +++ b/public/language/sl/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 je odprl/-a novo temo: %2.", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 te je začel/-a spremljati.", "user-started-following-you-dual": "%1 in %2 sta te začela/-i spremljati.", @@ -75,6 +75,7 @@ "email-confirmed": "E-poštni naslov potrjen", "email-confirmed-message": "Hvala, da ste potrdili svoj e-naslov. Račun je sedaj aktiviran.", "email-confirm-error-message": "Prišlo je do napake pri preverjanju vašega e-poštnega naslova. Morda je bila koda napačna ali pa je potekla.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Potrditveno e-sporočilo je poslano.", "none": "None", "notification-only": "Notification Only", diff --git a/public/language/sl/post-queue.json b/public/language/sl/post-queue.json index 8dfaeee200..e3f4fa9f18 100644 --- a/public/language/sl/post-queue.json +++ b/public/language/sl/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/sl/user.json b/public/language/sl/user.json index 2c72679d73..bb7fa2800e 100644 --- a/public/language/sl/user.json +++ b/public/language/sl/user.json @@ -78,6 +78,7 @@ "change-password": "Spremeni geslo", "change-password-error": "Napačno geslo!", "change-password-error-wrong-current": "Tvoje trenutno geslo je napačno!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Gesli se morata ujemati!", "change-password-error-privileges": "Nimaš pravice do spremembe gesla.", "change-password-success": "Geslo je bilo posodobljeno!", diff --git a/public/language/sl/users.json b/public/language/sl/users.json index a81c715447..f377e33277 100644 --- a/public/language/sl/users.json +++ b/public/language/sl/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Zadnji uporabniki", "top-posters": "Najboljši uporabniki", "most-reputation": "Največ ugleda", diff --git a/public/language/sq-AL/admin/development/info.json b/public/language/sq-AL/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/sq-AL/admin/development/info.json +++ b/public/language/sq-AL/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/sq-AL/admin/extend/widgets.json b/public/language/sq-AL/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/sq-AL/admin/extend/widgets.json +++ b/public/language/sq-AL/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/sq-AL/admin/settings/reputation.json b/public/language/sq-AL/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/sq-AL/admin/settings/reputation.json +++ b/public/language/sq-AL/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/sq-AL/error.json b/public/language/sq-AL/error.json index 60987e97fc..8b0aeddbe3 100644 --- a/public/language/sq-AL/error.json +++ b/public/language/sq-AL/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Na vjen keq, por përshkrimi nuk mund të jetë më i gjatë se %1 karakter(e).", "cant-chat-with-yourself": "Nuk mund të bësh bashkëbisedim me veten!", "chat-restricted": "Ky përdorues ka kufizuar mesazhet e tij. Duhet t'ju ndjekin përpara se të bisedoni të", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Sistemi i bisedës është çaktivizuar", "too-many-messages": "Ju keni dërguar shumë mesazhe, ju lutemi prisni pak.", "invalid-chat-message": "Mesazh i pasaktë në bisedë", diff --git a/public/language/sq-AL/modules.json b/public/language/sq-AL/modules.json index 8d6f61e825..48554b92cc 100644 --- a/public/language/sq-AL/modules.json +++ b/public/language/sq-AL/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Bisedo me", - "chat.placeholder": "Shkruani mesazhin e bisedës këtu, tërhiqni dhe lëshoni imazhet, shtypni enter për t'i dërguar", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/sq-AL/notifications.json b/public/language/sq-AL/notifications.json index 14fe76838b..0a937ec756 100644 --- a/public/language/sq-AL/notifications.json +++ b/public/language/sq-AL/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 ka postuar një temë të re: %2", "user-edited-post": "%1 ka redaktuar një postim në %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 filloi t'ju ndjekë.", "user-started-following-you-dual": "% 1 dhe %2 filluan t'ju ndjekin.", @@ -75,6 +75,7 @@ "email-confirmed": "Email-i u konfirmua", "email-confirmed-message": "Faleminderit për vërtetimin e emailit tuaj. Llogaria juaj tani është plotësisht e aktivizuar.", "email-confirm-error-message": "Pati një problem me vërtetimin e adresës tuaj të emailit. Ndoshta kodi ishte i pavlefshëm ose ka skaduar.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Email i konfirmimit u dërgua.", "none": "Asnjë", "notification-only": "Vetëm njoftime", diff --git a/public/language/sq-AL/post-queue.json b/public/language/sq-AL/post-queue.json index c6247613bf..7df9f032b8 100644 --- a/public/language/sq-AL/post-queue.json +++ b/public/language/sq-AL/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 postime u pranuan", - "bulk-reject-success": "%1 postime u refuzuan" + "bulk-reject-success": "%1 postime u refuzuan", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/sq-AL/user.json b/public/language/sq-AL/user.json index a5904e748b..e1d0ae9b4c 100644 --- a/public/language/sq-AL/user.json +++ b/public/language/sq-AL/user.json @@ -78,6 +78,7 @@ "change-password": "Ndrysho fjalekalimin", "change-password-error": "Fjalëkalim i pavlefshëm", "change-password-error-wrong-current": "Fjalëkalimi juaj aktual nuk është i saktë!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Fjalekalimet duhet te perputhen!", "change-password-error-privileges": "Ju nuk keni të drejtë ta ndryshoni këtë fjalëkalim.", "change-password-success": "Fjalëkalimi juaj është përditësuar!", diff --git a/public/language/sq-AL/users.json b/public/language/sq-AL/users.json index d5d171e0b8..c064822c9d 100644 --- a/public/language/sq-AL/users.json +++ b/public/language/sq-AL/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Përdoruesit e fundit", "top-posters": "Postuesit më të mirë", "most-reputation": "Me Reputacion", diff --git a/public/language/sr/admin/development/info.json b/public/language/sr/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/sr/admin/development/info.json +++ b/public/language/sr/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/sr/admin/extend/widgets.json b/public/language/sr/admin/extend/widgets.json index 5d2832feed..db72f2feb3 100644 --- a/public/language/sr/admin/extend/widgets.json +++ b/public/language/sr/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", diff --git a/public/language/sr/admin/settings/reputation.json b/public/language/sr/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/sr/admin/settings/reputation.json +++ b/public/language/sr/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/sr/error.json b/public/language/sr/error.json index 5f8b104f9b..28504c63e2 100644 --- a/public/language/sr/error.json +++ b/public/language/sr/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Жао нам је, информације о вама не смеју бити дуже од %1 знак(ов)а.", "cant-chat-with-yourself": "Не можете ћаскати са самим собом!", "chat-restricted": "Овај корисник је ограничио њихова ћаскања. Морају вас пратити пре него што можете ћаскати са њима.", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Ћаскања су онемогућена", "too-many-messages": "Послали сте превише порука, сачекајте мало.", "invalid-chat-message": "Неважећа порука", diff --git a/public/language/sr/modules.json b/public/language/sr/modules.json index 717904742c..c2bae5b14e 100644 --- a/public/language/sr/modules.json +++ b/public/language/sr/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Соба %1", "chat.chatting-with": "Ћаскај са", - "chat.placeholder": "Куцајте поруку ћаскања овде, превуците и отпустите слике, притисните enter за слање", - "chat.placeholder.mobile": "Куцајте поруку овде", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Идите на најновију поруку", "chat.usernames-and-x-others": "%1 & %2 осталих", "chat.chat-with-usernames": "Ћаскај са %1", diff --git a/public/language/sr/notifications.json b/public/language/sr/notifications.json index ba93a6346c..1972607171 100644 --- a/public/language/sr/notifications.json +++ b/public/language/sr/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 и осталих %3 су објавили одговор: %4", "user-posted-topic": "%1 је поставио нову тему: %2", "user-edited-post": "%1 је уредио поруку у %2", - "user-posted-topic-with-tag": "%1 је објавио нову тему са ознаком %2", - "user-posted-topic-with-tag-dual": "%1 је објавио нову тему са ознакама %2 и %3", - "user-posted-topic-with-tag-triple": "%1 је објавио нову тему са ознакама %2, %3 и %4", - "user-posted-topic-with-tag-multiple": "%1 је објавио нову тему са ознакама %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 је почео да вас прати.", "user-started-following-you-dual": "%1 и %2 су почели да вас прате.", @@ -75,6 +75,7 @@ "email-confirmed": "Е-пошта је потврђена.", "email-confirmed-message": "Хвала на овери ваше е-поште. Ваш налог је сада у потпуности активан.", "email-confirm-error-message": "Дошло је до проблема са овером ваше е-поште. Можда је код неисправан или је истекао.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Е-пошта за потврду је послата.", "none": "Ниједно", "notification-only": "Само обавештење", diff --git a/public/language/sr/post-queue.json b/public/language/sr/post-queue.json index 07478e802f..e9c42569b5 100644 --- a/public/language/sr/post-queue.json +++ b/public/language/sr/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Уклони изабрано", "remove-selected-confirm": "Да ли желите да уклоните изабране објаве (%1)?", "bulk-accept-success": "Прихваћених објава: %1", - "bulk-reject-success": "Одбачених објава: %1" + "bulk-reject-success": "Одбачених објава: %1", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/sr/user.json b/public/language/sr/user.json index 4f53352bb8..c706963571 100644 --- a/public/language/sr/user.json +++ b/public/language/sr/user.json @@ -78,6 +78,7 @@ "change-password": "Промена лозинке", "change-password-error": "Неисправна лозинка", "change-password-error-wrong-current": "Ваша тренутна лозинка није исправна!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Лозинке се морају подударати!", "change-password-error-privileges": "Немате дозволу за мењање ове лозинке.", "change-password-success": "Ваша лозинка је ажурирана!", diff --git a/public/language/sr/users.json b/public/language/sr/users.json index 51c24f73fd..096af8474b 100644 --- a/public/language/sr/users.json +++ b/public/language/sr/users.json @@ -1,5 +1,6 @@ { "all-users": "Сви корисници", + "followed-users": "Followed Users", "latest-users": "Најновији корисници", "top-posters": "Највише порука", "most-reputation": "Највећи углед", diff --git a/public/language/sv/admin/development/info.json b/public/language/sv/admin/development/info.json index 11202d9c3a..9834719daf 100644 --- a/public/language/sv/admin/development/info.json +++ b/public/language/sv/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nodes responded within %2ms!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Registered", "sockets": "Sockets", + "connection-count": "Connection Count", "guests": "Guests", "info": "Info" diff --git a/public/language/sv/admin/extend/widgets.json b/public/language/sv/admin/extend/widgets.json index 5d2832feed..f08df14dc4 100644 --- a/public/language/sv/admin/extend/widgets.json +++ b/public/language/sv/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Alert", "alert.confirm-delete": "Are you sure you wish to delete this widget?", @@ -26,10 +28,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/reputation.json b/public/language/sv/admin/settings/reputation.json index e4fff22620..479069e3a4 100644 --- a/public/language/sv/admin/settings/reputation.json +++ b/public/language/sv/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Reputation Settings", "disable": "Disable Reputation System", "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Activity Thresholds", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", 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/error.json b/public/language/sv/error.json index fb22029793..762b59cbf3 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Din text om dig själv kan inte vara längre än %1 tecken.", "cant-chat-with-yourself": "Du kan inte chatta med dig själv!", "chat-restricted": "Denna användaren har begränsat sina meddelanden. Användaren måste följa dig innan ni kan chatta med varandra", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Chatten är inaktiverad", "too-many-messages": "Du har skickat för många meddelanden, var god vänta", "invalid-chat-message": "Ogiltigt chattmeddelande", 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 779b08ad3f..50c7275435 100644 --- a/public/language/sv/modules.json +++ b/public/language/sv/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Chatta med", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", @@ -78,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?", @@ -87,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", @@ -111,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 9ca90fa226..42e431a7ef 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.", @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 har skapat ett nytt ämne: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 började följa dig.", "user-started-following-you-dual": "%1 och %2 började följa dig.", @@ -75,6 +75,7 @@ "email-confirmed": "E-post bekräftad", "email-confirmed-message": "Tack för att du bekräftat din e-postadress. Ditt konto är nu fullt ut aktiverat.", "email-confirm-error-message": "Det uppstod ett problem med bekräftelsen av din e-postadress. Kanske var koden felaktig eller ogiltig.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Bekräftelsemeddelande skickat.", "none": "Inga", "notification-only": "Endast notis", diff --git a/public/language/sv/post-queue.json b/public/language/sv/post-queue.json index 021ed0d83f..24b33da2e6 100644 --- a/public/language/sv/post-queue.json +++ b/public/language/sv/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/sv/user.json b/public/language/sv/user.json index ca6c60fc6d..cdc40df5c7 100644 --- a/public/language/sv/user.json +++ b/public/language/sv/user.json @@ -78,6 +78,7 @@ "change-password": "Ändra lösenord", "change-password-error": "Ogiltigt lösenord.", "change-password-error-wrong-current": "Ditt nuvarande lösenord är inte korrekt.", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Lösenorden måste stämma överens.", "change-password-error-privileges": "Du har inte rättigheter att ändra det här lösenordet.", "change-password-success": "Ditt lösenord är uppdaterat.", diff --git a/public/language/sv/users.json b/public/language/sv/users.json index 6c5a2a354a..e918e1a276 100644 --- a/public/language/sv/users.json +++ b/public/language/sv/users.json @@ -1,5 +1,6 @@ { "all-users": "Alla användare", + "followed-users": "Followed Users", "latest-users": "Senaste användarna", "top-posters": "Flest inlägg", "most-reputation": "Bäst rykte", diff --git a/public/language/th/admin/appearance/customise.json b/public/language/th/admin/appearance/customise.json index f9d55fc61e..e4eb42f234 100644 --- a/public/language/th/admin/appearance/customise.json +++ b/public/language/th/admin/appearance/customise.json @@ -15,6 +15,6 @@ "custom-css.livereload": "เปิดการบังคับให้มีผลในทันที", "custom-css.livereload.description": "การเปิดนี้จะบังคับทุกเซสชั่นบนทุกอุปกรณ์ภายใต้บัญชีของคุณให้ถูกรีเฟรชทันทีที่คุณกดบันทึก", "bsvariables": "_variables.scss", - "bsvariables.description": "แทนที่ค่าตัวแปร bootstrap ที่นี่ คุณยังสามารถใช้เครื่องมือ bootstrap.build และคัดลอกผลลัพธ์ลงในนี้
การเปลี่ยนแปลงต้องทำ rebuild และเริ่มต้นใหม่", - "bsvariables.enable": "เปิด _variables.scss" + "bsvariables.description": "แทนที่ค่าตัวแปร bootstrap ที่นี่ คุณยังสามารถใช้เครื่องมือ bootstrap.build และคัดลอกผลลัพธ์ลงในนี้
การเปลี่ยนแปลงต้องสร้างและเริ่มต้นระบบใหม่", + "bsvariables.enable": "เปิดการใช้งาน _variables.scss" } \ No newline at end of file diff --git a/public/language/th/admin/dashboard.json b/public/language/th/admin/dashboard.json index dda2fc3916..5049bb87e1 100644 --- a/public/language/th/admin/dashboard.json +++ b/public/language/th/admin/dashboard.json @@ -49,44 +49,44 @@ "maintenance-mode": "โหมดการซ่อมบำรุง", "maintenance-mode-title": "คลิกที่นี่เพื่อเข้าสู่โหมดการซ่อมบำรุงของ NodeBB", "dark-mode": "โหมดมืด", - "realtime-chart-updates": "Realtime Chart Updates", + "realtime-chart-updates": "กราฟแสดงผลแบบเรียลไทม์", - "active-users": "Active Users", - "active-users.users": "Users", - "active-users.guests": "Guests", - "active-users.total": "Total", - "active-users.connections": "Connections", + "active-users": "ผู้ใช้งานที่กำลังดู", + "active-users.users": "ผู้ใช้งาน", + "active-users.guests": "ผู้มาเยือน", + "active-users.total": "รวม", + "active-users.connections": "การเชื่อมต่อ", - "guest-registered-users": "Guest vs Registered Users", - "guest": "Guest", - "registered": "Registered", + "guest-registered-users": "ผู้มาเยือน เทียบกับ ผู้ลงทะเบียนแล้ว", + "guest": "ผู้มาเยือน", + "registered": "ลงทะเบียนแล้ว", - "user-presence": "User Presence", - "on-categories": "On categories list", - "reading-posts": "Reading posts", - "browsing-topics": "Browsing topics", - "recent": "Recent", - "unread": "Unread", + "user-presence": "ตำแหน่งของผู้ใช้งาน", + "on-categories": "อยู่ในรายการหมวดหมู่", + "reading-posts": "กำลังอ่านโพสต์", + "browsing-topics": "กำลังดูหัวข้อกระทู้", + "recent": "เนื้อหาล่าสุด", + "unread": "ยังไม่ได้อ่าน", - "high-presence-topics": "High Presence Topics", - "popular-searches": "Popular Searches", + "high-presence-topics": "กระทู้ที่คนเข้าดูมาก", + "popular-searches": "คำค้นที่นิยม", - "graphs.page-views": "Page Views", - "graphs.page-views-registered": "Page Views Registered", - "graphs.page-views-guest": "Page Views Guest", - "graphs.page-views-bot": "Page Views Bot", - "graphs.unique-visitors": "Unique Visitors", - "graphs.registered-users": "Registered Users", - "graphs.guest-users": "Guest Users", - "last-restarted-by": "Last restarted by", - "no-users-browsing": "No users browsing", + "graphs.page-views": "ยอดวิว", + "graphs.page-views-registered": "ยอดวิวจากผู้ลงทะเบียนแล้ว", + "graphs.page-views-guest": "ยอดวิวจากผู้มาเยือน", + "graphs.page-views-bot": "ยอดวิวจากบอต", + "graphs.unique-visitors": "จำนวนผู้ใช้ที่ไม่ซ้ำกัน", + "graphs.registered-users": "ผู้ใช้ที่ลงทะเบียนแล้ว", + "graphs.guest-users": "ผู้ใช้ที่เป็นผู้มาเยือน", + "last-restarted-by": "เริ่มต้นระบบใหม่ครั้งสุดท้ายโดย", + "no-users-browsing": "ไม่มีผู้ใช้งานที่กำลังดู", - "back-to-dashboard": "Back to Dashboard", - "details.no-users": "No users have joined within the selected timeframe", - "details.no-topics": "No topics have been posted within the selected timeframe", - "details.no-searches": "No searches have been made within the selected timeframe", - "details.no-logins": "No logins have been recorded within the selected timeframe", - "details.logins-static": "NodeBB only saves session data for %1 days, and so this table below will only show the most recently active sessions", + "back-to-dashboard": "กลับไปที่แดชบอร์ด", + "details.no-users": "ไม่มีผู้ใช้งานที่เข้าร่วมในช่วงเวลาที่เลือก", + "details.no-topics": "ไม่มีกระทู้ที่โพสต์ในช่วงเวลาที่เลือก", + "details.no-searches": "ไม่มีการค้นหาในช่วงเวลาที่เลือก", + "details.no-logins": "ไม่มีการเข้าสู่ระบบในช่วงเวลาที่เลือก", + "details.logins-static": "NodeBB เก็บข้อมูลเซสชันแค่ %1 วัน ดังนั้นตารางข้างล่างนี้แสดงเฉพาะเซสชันล่าสุดเท่านั้น", "details.logins-login-time": "เวลาที่ล็อกอิน", "start": "เริ่มต้น", "end": "สิ้นสุด", diff --git a/public/language/th/admin/development/info.json b/public/language/th/admin/development/info.json index 504759aa23..b78747dc04 100644 --- a/public/language/th/admin/development/info.json +++ b/public/language/th/admin/development/info.json @@ -2,23 +2,24 @@ "you-are-on": "You are on %1:%2", "ip": "IP %1", "nodes-responded": "%1 nodes ตอบสนองแล้วภายใน %2ms!", - "host": "host", - "primary": "primary / run jobs", + "host": "โฮสต์", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", "git": "git", - "process-memory": "process memory", - "system-memory": "system memory", - "used-memory-process": "Used memory by process", - "used-memory-os": "Used system memory", - "total-memory-os": "Total system memory", - "load": "system load", - "cpu-usage": "cpu usage", + "process-memory": "หน่วยความจำโปรเซส", + "system-memory": "หน่วยความจำระบบ", + "used-memory-process": "หน่วยความจำที่ใช้โดยโปรเซส", + "used-memory-os": "หน่วยความจำระบบที่ใช้", + "total-memory-os": "หน่วยความจำระบบทั้งหมด", + "load": "โหลดของระบบ", + "cpu-usage": "การใช้งาน CPU", "uptime": "ระยะเวลาการทำงาน", "registered": "ลงทะเบียนแล้ว", - "sockets": "Sockets", + "sockets": "ซ็อกเก็ต", + "connection-count": "จำนวนการเชื่อมต่อ", "guests": "ผู้เยี่ยมเยียน", "info": "ข้อมูล" diff --git a/public/language/th/admin/extend/plugins.json b/public/language/th/admin/extend/plugins.json index 1a8f66fa6d..6f04a90ae7 100644 --- a/public/language/th/admin/extend/plugins.json +++ b/public/language/th/admin/extend/plugins.json @@ -1,6 +1,6 @@ { "plugins": "Plugins", - "trending": "Trending", + "trending": "กำลังนิยม", "installed": "ถูกติดตั้งแล้ว", "active": "ทำงาน", "inactive": "ไม่ทำงาน", @@ -11,7 +11,7 @@ "plugin-search": "การค้นหาปลั๊กอิน", "plugin-search-placeholder": "ค้นหาปลั๊กอิน...", - "submit-anonymous-usage": "Submit anonymous plugin usage data.", + "submit-anonymous-usage": "ส่งข้อมูลการใช้งานปลั๊กอินโดยไม่เปิดเผยตัวตน", "reorder-plugins": "เรียงลำดับปลั๊กอินใหม่", "order-active": "ลำดับการทำงานของปลั๊กอิน", "dev-interested": "คุณสนใจที่จะสร้างปลั๊กอินสำหรับ NodeBB หรือไม่?", @@ -32,25 +32,25 @@ "plugin-item.more-info": "ข้อมูลเพิ่มเติม:", "plugin-item.unknown": "ไม่ทราบ", "plugin-item.unknown-explanation": "สถานะของปลั๊กอินนี้ไม่สามารถระบุได้ซึ่งอาจเกิดจากข้อผิดพลาดในการกำหนดค่าผิดพลาด", - "plugin-item.compatible": "This plugin works on NodeBB %1", - "plugin-item.not-compatible": "This plugin has no compatibility data, make sure it works before installing on your production environment.", + "plugin-item.compatible": "ปลั๊กอินนี้ทำงานได้กับ NodeBB %1", + "plugin-item.not-compatible": "ปลั๊กอินนี้ไม่มีข้อมูลความเข้ากันได้ โปรดทดสอบว่ามันทำงานก่อนที่จะติดตั้งลงในระบบใช้งานจริง", "alert.enabled": "เปิดใช้งานปลั๊กอินแล้ว", "alert.disabled": "ปิดใช้งานปลั๊กอินแล้ว", "alert.upgraded": "อัพเกรดปลั๊กอินแล้ว", "alert.installed": "ติดตั้งปลั๊กอินแล้ว", "alert.uninstalled": "ถอนการติดตั้งปลั๊กอินแล้ว", - "alert.activate-success": "Please rebuild and restart your NodeBB to fully activate this plugin", + "alert.activate-success": "โปรดสร้างและเริ่มต้น NodeBB ใหม่เพื่อเปิดการใช้งานปลั๊กอินนี้โดยสมบูรณ์", "alert.deactivate-success": "ปิดการใช้งานปลั๊กอินนี้แล้ว", - "alert.upgrade-success": "Please rebuild and restart your NodeBB to fully upgrade this plugin.", + "alert.upgrade-success": "โปรดสร้างและเริ่มต้น NodeBB ใหม่เพื่ออัพเกรดปลั๊กอินนี้", "alert.install-success": "ติดตั้งปลั๊กอินแล้ว โปรดเปิดใช้งานปลั๊กอิน", "alert.uninstall-success": "ปิดใช้งานปลั๊กอินและยกเลิกการติดตั้งแล้ว", "alert.suggest-error": "

NodeBB ไม่สามารถเข้าถึงตัวจัดการแพคเกจดำเนินการติดตั้งเวอร์ชันล่าสุดได้หรือไม่?

เซิร์ฟเวอร์ตอบกลับ (%1): %2
", "alert.package-manager-unreachable": "

NodeBB ไม่สามารถติดต่อตัวจัดการแพคเกจได้ในขณะนี้เราไม่แนะนำให้อัปเกรด

", "alert.incompatible": "เวอร์ชันของ NodeBB (v%1) จะถูกล้างเพื่อให้มีการอัพเกรดไป v%2 ของปลั๊กอินนี้ โปรดอัปเดต NodeBB ของคุณหากคุณต้องการติดตั้งปลั๊กอินเวอร์ชันใหม่นี้

", "alert.possibly-incompatible": "

ไม่พบข้อมูลความเข้ากันได้

ปลั๊กอินนี้ไม่ได้ระบุเวอร์ชันเฉพาะสำหรับการติดตั้งที่ให้เวอร์ชัน NodeBB ของคุณ ไม่สามารถรับประกันความสามารถในการใช้งานร่วมกันได้เต็มรูปแบบและอาจทำให้ NodeBB ของคุณทำงานไม่ได้อย่างถูกต้องอีกต่อไป

ในกรณีที่ NodeBB ไม่สามารถบูตได้อย่างถูกต้อง:

$ ./nodebb reset plugin=\"%1\"

ติดตั้งปลั๊กอินนี้เวอร์ชันล่าสุดต่อหรือไม่?

", - "alert.reorder": "Plugins Re-ordered", - "alert.reorder-success": "Please rebuild and restart your NodeBB to fully complete the process.", + "alert.reorder": "ปลั๊กอินถูกเรียงลำดับใหม่แล้ว", + "alert.reorder-success": "โปรดสร้างและเริ่มต้น NodeBB ใหม่เพื่อเสร็จสิ้นกระบวนการ", "license.title": "ข้อมูลลิขสิทธิ์ปลั๊กอิน", "license.intro": "ปลั๊กอิน %1ได้รับอนุญาตภายใต้ %2 โปรดอ่านและทำความเข้าใจข้อกำหนดสิทธิ์การใช้งานก่อนเปิดใช้งานปลั๊กอินนี้", diff --git a/public/language/th/admin/extend/rewards.json b/public/language/th/admin/extend/rewards.json index 2706a25f51..c334de8498 100644 --- a/public/language/th/admin/extend/rewards.json +++ b/public/language/th/admin/extend/rewards.json @@ -1,17 +1,17 @@ { "rewards": "Rewards", - "add-reward": "Add reward", - "condition-if-users": "If User's", - "condition-is": "Is:", - "condition-then": "Then:", - "max-claims": "Amount of times reward is claimable", - "zero-infinite": "Enter 0 for infinite", - "select-reward": "Select reward", - "delete": "Delete", - "enable": "Enable", - "disable": "Disable", + "add-reward": "เพิ่มรางวัล", + "condition-if-users": "ถ้า ... ของผู้ใช้งาน", + "condition-is": "มีค่า:", + "condition-then": "แล้ว:", + "max-claims": "จำนวนครั้งที่สามารถรับรางวัลได้", + "zero-infinite": "ใส่ 0 ถ้ารับได้ไม่จำกัด", + "select-reward": "เลือกรางวัล", + "delete": "ลบ", + "enable": "เปิดการใช้งาน", + "disable": "ปิดการใช้งาน", - "alert.delete-success": "Successfully deleted reward", - "alert.no-inputs-found": "Illegal reward - no inputs found!", - "alert.save-success": "Successfully saved rewards" + "alert.delete-success": "ลบรางวัลสำเร็จ", + "alert.no-inputs-found": "รางวัลไม่ถูกต้อง - ยังไม่ได้ใส่ข้อมูล!", + "alert.save-success": "บันทึกรางวัลสำเร็จ" } \ No newline at end of file diff --git a/public/language/th/admin/extend/widgets.json b/public/language/th/admin/extend/widgets.json index 41d352d04b..b9309eaaa1 100644 --- a/public/language/th/admin/extend/widgets.json +++ b/public/language/th/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "การ์ด", "container.card-header": "ส่วนหัวของการ์ด", "container.card-body": "ข้างในการ์ด", + "container.title": "ชื่อ", + "container.body": "เนื้อหา", "container.alert": "แจ้งเตือน", "alert.confirm-delete": "คุณต้องการจะลบวิดเจ็ตนี้หรือไม่?", diff --git a/public/language/th/admin/manage/categories.json b/public/language/th/admin/manage/categories.json index 8a9ff471b0..6d114d5abb 100644 --- a/public/language/th/admin/manage/categories.json +++ b/public/language/th/admin/manage/categories.json @@ -1,31 +1,31 @@ { - "manage-categories": "Manage Categories", - "add-category": "Add category", - "jump-to": "Jump to...", - "settings": "Category Settings", - "edit-category": "Edit Category", - "privileges": "Privileges", - "back-to-categories": "Back to categories", - "name": "Category Name", - "description": "Category Description", - "bg-color": "Background Colour", - "text-color": "Text Colour", - "bg-image-size": "Background Image Size", - "custom-class": "Custom Class", - "num-recent-replies": "# of Recent Replies", - "ext-link": "External Link", - "subcategories-per-page": "Subcategories per page", + "manage-categories": "จัดการหมวดหมู่", + "add-category": "เพิ่มหมวดหมู่", + "jump-to": "ไปที่...", + "settings": "การตั้งค่าหมวดหมู่", + "edit-category": "แก้ไขหมวดหมู่", + "privileges": "สิทธิ์", + "back-to-categories": "กลับไปที่หมวดหมู่ทั้งหมด", + "name": "ชื่อหมวดหมู่", + "description": "คำอธิบายหมวดหมู่", + "bg-color": "สีพื้น", + "text-color": "สีข้อความ", + "bg-image-size": "ขนาดภาพพื้นหลัง", + "custom-class": "ปรับแต่งคลาส", + "num-recent-replies": "จำนวนตอบกลับล่าสุด", + "ext-link": "ลิงก์ภายนอก", + "subcategories-per-page": "จำนวนหมวดหมู่ย่อยต่อหน้า", "is-section": "Treat this category as a section", - "post-queue": "Post queue", + "post-queue": "คิวการโพสต์", "tag-whitelist": "Tag Whitelist", - "upload-image": "Upload Image", - "upload": "Upload", - "delete-image": "Remove", - "category-image": "Category Image", - "image-and-icon": "Image & Icon", + "upload-image": "อัปโหลดรูป", + "upload": "อัปโหลด", + "delete-image": "ลบ", + "category-image": "รูปภาพหมวดหมู่", + "image-and-icon": "ภาพ & ไอคอน", "parent-category": "Parent Category", "optional-parent-category": "(Optional) Parent Category", - "top-level": "Top Level", + "top-level": "ระดับบนสุด", "parent-category-none": "(None)", "copy-parent": "Copy Parent", "copy-settings": "Copy Settings From", @@ -33,8 +33,8 @@ "clone-children": "Clone Children Categories And Settings", "purge": "Purge Category", - "enable": "Enable", - "disable": "Disable", + "enable": "เปิดการใช้งาน", + "disable": "ปิดการใช้งาน", "edit": "Edit", "analytics": "Analytics", diff --git a/public/language/th/admin/manage/users.json b/public/language/th/admin/manage/users.json index 482fc0148f..d876b10871 100644 --- a/public/language/th/admin/manage/users.json +++ b/public/language/th/admin/manage/users.json @@ -2,8 +2,8 @@ "manage-users": "Manage Users", "users": "ผู้ใช้", "edit": "จัดการ", - "make-admin": "ทำให้เป็นแอดมิน", - "remove-admin": "ยกเลิกการเป็นแอดมิน", + "make-admin": "ทำให้เป็นผู้ดูแลระบบ", + "remove-admin": "ยกเลิกการเป็นผู้ดูแลระบบ", "change-email": "เปลี่ยนอีเมล", "new-email": "เพิ่มอีเมลใหม่", "validate-email": "ยืนยันอีเมล", @@ -90,25 +90,25 @@ "alerts.flag-reset-success": "ยกเลิกรายงานแล้ว!", "alerts.no-remove-yourself-admin": "คุณไม่สามารถที่จะยกเลิกตัวเองจากการเป็นผู้ดูแลระบบ", "alerts.make-admin-success": "ขณะนี้ผู้ใช้เป็นผู้ดูแลระบบแล้ว", - "alerts.confirm-remove-admin": "คุณต้องการลบผู้ดูแลระบบคนนี้หรือไม่?", - "alerts.remove-admin-success": "ผู้ใช้ไม่ได้เป็นผู้ดูแลอีกต่อไป", - "alerts.make-global-mod-success": "ขณะนี้ผู้ใช้เป็นผู้ดูแลระดับโลกแล้ว", - "alerts.confirm-remove-global-mod": "คุณต้องการลบผู้ดูแลทั่วโลกนี้หรือไม่?", - "alerts.remove-global-mod-success": "ผู้ใช้ไม่เป็นผู้ดูแลระดับโลกอีกแล้ว", - "alerts.make-moderator-success": "ขณะนี้ผู้ใช้เป็นผู้ดูแล", - "alerts.confirm-remove-moderator": "คุณต้องการนำผู้ดูแลนี้ออกหรือไม่?", - "alerts.remove-moderator-success": "ผู้ใช้ไม่ได้เป็นผู้ดูแลอีกต่อไป", + "alerts.confirm-remove-admin": "คุณต้องการปลดผู้ดูแลระบบคนนี้หรือไม่?", + "alerts.remove-admin-success": "ผู้ใช้ไม่ได้เป็นผู้ดูแลระบบอีกต่อไป", + "alerts.make-global-mod-success": "ขณะนี้ผู้ใช้เป็นผู้ดูแลบอร์ดรวมแล้ว", + "alerts.confirm-remove-global-mod": "คุณต้องการปลดผู้ดูแลบอร์ดรวมนี้หรือไม่?", + "alerts.remove-global-mod-success": "ผู้ใช้ไม่เป็นผู้ดูแลบอร์ดรวมอีกแล้ว", + "alerts.make-moderator-success": "ขณะนี้ผู้ใช้เป็นผู้ดูแลบอร์ดแล้ว", + "alerts.confirm-remove-moderator": "คุณต้องการปลดผู้ดูแลบอร์ดนี้ออกหรือไม่?", + "alerts.remove-moderator-success": "ผู้ใช้ไม่ได้เป็นผู้ดูแลบอร์ดอีกต่อไป", "alerts.confirm-validate-email": "คุณต้องการที่ยืนยันอีเมลของผู้ใช้เหล่านี้หรือไม่?", "alerts.confirm-force-password-reset": "คุณต้องการให้ผู้ใช้เหล่านี้ถูกรีเซ็ตรหัสผ่านและออกจากระบบหรือไม่?", "alerts.validate-email-success": "อีเมลที่ได้รับการยืนยัน", "alerts.validate-force-password-reset-success": "รหัสผ่านของผู้ใช้งานถูกรีเซ็ต และการเข้าระบบถูกถอดออก", "alerts.password-reset-confirm": "คุณต้องการที่จะส่งอีเมลการล้างค่ารหัสผ่านให้กับผู้ใช้เหล่านี้หรือไม่?", "alerts.password-reset-email-sent": "อีเมลรีเซ็ตรหัสผ่านถูกส่งแล้ว", - "alerts.confirm-delete": "Warning!

Do you really want to delete user(s)?

This action is not reversible! Only the user account will be deleted, their posts and topics will remain.

", - "alerts.delete-success": "ผู้ใช้งานโดนลบ!", - "alerts.confirm-delete-content": "Warning!

Do you really want to delete these user(s) content?

This action is not reversible! The users' accounts will remain, but their posts and topics will be deleted.

", - "alerts.delete-content-success": "User(s) Content Deleted!", - "alerts.confirm-purge": "Warning!

Do you really want to delete user(s) and their content?

This action is not reversible! All user data and content will be erased!

", + "alerts.confirm-delete": "คำเตือน!

คุณต้องการลบ ผู้ใช้งานหรือไม่?

คำสั่งนี้ไม่สามารถย้อนกลับได้! เฉพาะบัญชีผู้ใช้งานเท่านั้นที่จะถูกลบ โพสต์และกระทู้ของผู้ใช้งานจะยังคงอยู่

", + "alerts.delete-success": "ผู้ใช้งานถูกลบแล้ว!", + "alerts.confirm-delete-content": "คำเตือน!

คุณต้องการลบเนื้อหาของผู้ใช้งานหรือไม่?

คำสั่งนี้ไม่สามารถย้อนกลับได้! บัญชีผู้ใช้งานจะยังคงอยู่ แต่โพสต์และกระทู้ของผู้ใช้งานจะถูกลบ

", + "alerts.delete-content-success": "เนื้อหาของผู้ใช้งานถูกลบแล้ว!", + "alerts.confirm-purge": "คำเตือน!

คุณต้องการลบผู้ใช้งานและเนื้อหาหรือไม่?

คำสั่งนี้ไม่สามารถย้อนกลับได้! ข้อมูลผู้ใช้งานและเนื้อหาจะถูกลบทั้งหมด!

", "alerts.create": "สร้างผู้ใช้งาน", "alerts.button-create": "สร้าง", "alerts.button-cancel": "ยกเลิก", @@ -119,8 +119,8 @@ "alerts.prompt-email": "อีเมล: ", "alerts.email-sent-to": "อีเมลคำเชิญถูกส่งไปที่ %1", - "alerts.x-users-found": "%1 user(s) found, (%2 seconds)", - "alerts.select-a-single-user-to-change-email": "Select a single user to change email", + "alerts.x-users-found": "พบผู้ใช้งาน %1 ราย (ใช้เวลา %2 วินาที)", + "alerts.select-a-single-user-to-change-email": "เลือกผู้ใช้งานที่จะเปลี่ยนอีเมล", "export": "ส่งออกไฟล์", "export-users-fields-title": "เลือกฟิลด์สำหรับ CSV", "export-field-email": "อีเมล", @@ -143,9 +143,9 @@ "export-field-signature": "ลายเซ็น", "export-field-aboutme": "เกี่ยวกับฉัน", - "export-users-started": "Exporting users as csv, this might take a while. You will receive a notification when it is complete.", - "export-users-completed": "Users exported as csv, click here to download.", - "email": "Email", - "password": "Password", - "manage": "Manage" + "export-users-started": "กำลังส่งออกข้อมูลผู้ใช้งานเป็น CSV ซึ่งอาจใช้เวลาสักระยะ คุณจะได้รับการแจ้งเตือนเมื่อเสร็จแล้ว", + "export-users-completed": "ข้อมูลผู้ใช้งานถูกส่งออกเป็น CSV แล้ว คลิกที่นี่เพื่อดาวน์โหลด", + "email": "อีเมล", + "password": "รหัสผ่าน", + "manage": "จัดการ" } \ No newline at end of file diff --git a/public/language/th/admin/settings/homepage.json b/public/language/th/admin/settings/homepage.json index 48f9ebe23a..5a0b8eda6e 100644 --- a/public/language/th/admin/settings/homepage.json +++ b/public/language/th/admin/settings/homepage.json @@ -4,5 +4,5 @@ "home-page-route": "เส้นทางหน้าแรก", "custom-route": "เส้นทางที่กำหนดเอง", "allow-user-home-pages": "อนุญาตหน้าแรกของผู้ใช้", - "home-page-title": "Title ของหน้าแรก (ค่าเริ่มต้น \"Home\")" + "home-page-title": "ชื่อของหน้าแรก (ค่าเริ่มต้นคือ \"Home\")" } \ No newline at end of file diff --git a/public/language/th/admin/settings/reputation.json b/public/language/th/admin/settings/reputation.json index e4fff22620..cfa0047e73 100644 --- a/public/language/th/admin/settings/reputation.json +++ b/public/language/th/admin/settings/reputation.json @@ -1,37 +1,44 @@ { "reputation": "Reputation Settings", - "disable": "Disable Reputation System", - "disable-down-voting": "Disable Down Voting", - "votes-are-public": "All Votes Are Public", - "thresholds": "Activity Thresholds", - "min-rep-upvote": "Minimum reputation to upvote posts", - "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", - "upvotes-per-user-per-day": "Upvotes per user per day (set to 0 for unlimited upvotes)", - "min-rep-downvote": "Minimum reputation to downvote posts", - "downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)", - "downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)", - "min-rep-chat": "Minimum reputation to send chat messages", - "min-rep-post-links": "Minimum reputation to post links", - "min-rep-flag": "Minimum reputation to flag posts", - "min-rep-website": "Minimum reputation to add \"Website\" to user profile", - "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", - "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile", - "min-rep-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile", - "min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile", + "disable": "ปิดการใช้งานระบบชื่อเสียง", + "disable-down-voting": "ปิดการใช้งานการโหวดลง", + "upvote-visibility": "การมองเห็นผลโหวตขึ้น", + "upvote-visibility-all": "ทุกคนสามารถเห็นผลโหวตขึ้น", + "upvote-visibility-loggedin": "เฉพาะผู้ที่เข้าระบบแล้วถึงเห็นผลโหวตขึ้น", + "upvote-visibility-privileged": "เฉพาะผู้ที่ได้สิทธิ์เช่นผู้ดูแลระบบหรือผู้ควบคุมถึงเห็นผลโหวตขึ้น", + "downvote-visibility": "การมองเห็นผลโหวตลง", + "downvote-visibility-all": "ทุกคนสามารถเห็นผลโหวตลง", + "downvote-visibility-loggedin": "เฉพาะผู้ที่เข้าระบบแล้วถึงเห็นผลโหวตลง", + "downvote-visibility-privileged": "เฉพาะผู้ที่ได้สิทธิ์เช่นผู้ดูแลระบบหรือผู้ควบคุมถึงเห็นผลโหวตลง", + "thresholds": "เกณฑ์สำหรับการกระทำ", + "min-rep-upvote": "ชื่อเสียงขั้นต่ำที่สามารถโหวดโพสต์ขึ้นได้", + "upvotes-per-day": "จำนวนโหวดขึ้นต่อวัน (ตั้งค่าเป็น 0 ถ้าให้โหวดขึ้นได้ไม่จำกัดจำนวน)", + "upvotes-per-user-per-day": "จำนวนโหวดขึ้นต่อผู้ใช้งานต่อวัน (ตั้งค่าเป็น 0 ถ้าให้โหวดขึ้นได้ไม่จำกัดจำนวน)", + "min-rep-downvote": "ชื่อเสียงขั้นต่ำที่สามารถโหวดโพสต์ลงได้", + "downvotes-per-day": "จำนวนโหวดลงต่อวัน (ตั้งค่าเป็น 0 ถ้าให้โหวดลงได้ไม่จำกัดจำนวน)", + "downvotes-per-user-per-day": "จำนวนโหวดลงต่อผู้ใช้งานต่อวัน (ตั้งค่าเป็น 0 ถ้าให้โหวดลงได้ไม่จำกัดจำนวน)", + "min-rep-chat": "ชื่อเสียงขึ้นต่ำที่สามารถส่งข้อความแชทได้", + "min-rep-post-links": "ชื่อเสียงขึ้นต่ำที่สามารถโพสต์ลิงก์ได้", + "min-rep-flag": "ชื่อเสียงขึ้นต่ำที่สามารถรายงานโพสต์ได้", + "min-rep-website": "ชื่อเสียงขึ้นต่ำที่สามารถเพิ่ม เว็บไซต์ ลงในหน้าโปรไฟล์ผู้ใช้", + "min-rep-aboutme": "ชื่อเสียงขึ้นต่ำที่สามารถเพิ่ม ข้อมูลเกี่ยวกับฉัน ลงในหน้าโปรไฟล์ผู้ใช้", + "min-rep-signature": "ชื่อเสียงขึ้นต่ำที่สามารถเพิ่ม ลายเซ็น ลงในหน้าโปรไฟล์ผู้ใช้", + "min-rep-profile-picture": "ชื่อเสียงขึ้นต่ำที่สามารถเพิ่ม รูปภาพโปรไฟล์ ลงในหน้าโปรไฟล์ผู้ใช้", + "min-rep-cover-picture": "ชื่อเสียงขึ้นต่ำที่สามารถเพิ่ม รูปภาพปก ลงในหน้าโปรไฟล์ผู้ใช้", - "flags": "Flag Settings", - "flags.limit-per-target": "Maximum number of times something can be flagged", - "flags.limit-per-target-placeholder": "Default: 0", - "flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.", - "flags.limit-post-flags-per-day": "Maximum number of times a user can flag posts in a day", - "flags.limit-post-flags-per-day-help": "Set to 0 to disable, (default: 10)", - "flags.limit-user-flags-per-day": "Maximum number of times a user can flag users in a day", - "flags.limit-user-flags-per-day-help": "Set to 0 to disable, (default: 10)", - "flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts", - "flags.auto-flag-on-downvote-threshold-help": "Set to 0 to disable, (default: 0)", - "flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned", - "flags.action-on-resolve": "Do the following when a flag is resolved", - "flags.action-on-reject": "Do the following when a flag is rejected", - "flags.action.nothing": "Do nothing", - "flags.action.rescind": "Rescind the notification sent to moderators/administrators" + "flags": "การตั้งค่าการรายงาน", + "flags.limit-per-target": "จำนวนครั้งสูงสุดที่บางอย่างสามารถถูกรายงานได้", + "flags.limit-per-target-placeholder": "ค่าเริ่มต้น: 0", + "flags.limit-per-target-help": "เมื่อโพสต์หรือผู้ใช้งานถูกรายงานหลายครั้ง ทุกการรายงานเพิ่มเติมจะถูกนับเป็น "จำนวนรายงาน" ตั้งค่าตัวเลือกนี้เป็นตัวเลขอื่นนอกเหนือจาก 0 เพื่อจำกัดจำนวนรายงานที่สามารถได้รับ", + "flags.limit-post-flags-per-day": "จำนวนครั้งสูงสุดที่ผู้ใช้งานหนึ่งสามารถรายงานโพสต์ได้ใน 1 วัน", + "flags.limit-post-flags-per-day-help": "ตั้งค่าเป็น 0 ถ้าสามารถทำได้ไม่จำกัด (ค่าเริ่มต้น: 10)", + "flags.limit-user-flags-per-day": "จำนวนครั้งสูงสุดที่ผู้ใช้งานหนึ่งสามารถรายงานผู้ใช้งานอื่นได้ใน 1 วัน", + "flags.limit-user-flags-per-day-help": "ตั้งค่าเป็น 0 ถ้าสามารถทำได้ไม่จำกัด (ค่าเริ่มต้น: 10)", + "flags.auto-flag-on-downvote-threshold": "จำนวนการโหวดลงที่ทำให้ระบบรายงานโพสต์โดยอัตโนมัติทำงาน", + "flags.auto-flag-on-downvote-threshold-help": "ตั้งค่าเป็น 0 ถ้าสามารถทำได้ไม่จำกัด (ค่าเริ่มต้น: 10)", + "flags.auto-resolve-on-ban": "ถือว่ารายงานทั้งหมดของผู้ใช้งานถูกจัดการแล้วเมื่อผู้ใช้งานนั้นโดนแบน", + "flags.action-on-resolve": "เมื่อการรายงานถูกจัดการแล้ว ให้ทำดังต่อไปนี้", + "flags.action-on-reject": "เมื่อการรายงานถูกปฏิเสธ ให้ทำดังต่อไปนี้", + "flags.action.nothing": "ไม่ทำอะไร", + "flags.action.rescind": "ยกเลิกการแจ้งเตือน ผู้ดูแลบอร์ด และผู้ดูแลระบบ" } \ No newline at end of file diff --git a/public/language/th/admin/settings/sockets.json b/public/language/th/admin/settings/sockets.json index d04ee42fcf..0ad873891a 100644 --- a/public/language/th/admin/settings/sockets.json +++ b/public/language/th/admin/settings/sockets.json @@ -1,6 +1,6 @@ { "reconnection": "Reconnection Settings", - "max-attempts": "Max Reconnection Attempts", - "default-placeholder": "Default: %1", - "delay": "Reconnection Delay" + "max-attempts": "จำนวนการเชื่อมต่อใหม่สูงสุด", + "default-placeholder": "ค่าเริ่มต้น: %1", + "delay": "เวลาที่รอก่อนเชื่อมต่อใหม่" } \ No newline at end of file diff --git a/public/language/th/admin/settings/tags.json b/public/language/th/admin/settings/tags.json index c1cdb2b644..34b0620615 100644 --- a/public/language/th/admin/settings/tags.json +++ b/public/language/th/admin/settings/tags.json @@ -1,13 +1,13 @@ { "tag": "Tag Settings", - "link-to-manage": "Manage Tags", - "system-tags": "System Tags", - "system-tags-help": "Only privileged users will be able to use these tags.", - "tags-per-topic": "Tags per topic", - "min-per-topic": "Minimum Tags per Topic", - "max-per-topic": "Maximum Tags per Topic", - "min-length": "Minimum Tag Length", - "max-length": "Maximum Tag Length", - "related-topics": "Related Topics", - "max-related-topics": "Maximum related topics to display (if supported by theme)" + "link-to-manage": "จัดการแท็ก", + "system-tags": "แท็กของระบบ", + "system-tags-help": "เฉพาะผู้ที่มีสิทธิ์พิเศษถึงสามารถใช้แท็กเหล่านี้ได้", + "tags-per-topic": "จำนวนแท็กของกระทู้", + "min-per-topic": "จำนวนแท็กของกระทู้ขั้นต่ำ", + "max-per-topic": "จำนวนแท็กของกระทู้สูงสุด", + "min-length": "ความยาวแท็กขั้นต่ำ", + "max-length": "ความยาวแท็กสูงสุด", + "related-topics": "กระทู้ที่เกี่ยวข้อง", + "max-related-topics": "แสดงจำนวนกระทู้ที่เกี่ยวข้องมากสุด (ถ้าธีมรองรับ)" } \ No newline at end of file diff --git a/public/language/th/error.json b/public/language/th/error.json index b9ade6bfae..5b7a298cfc 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "ขออภัย \"เกี่ยวกับฉัน\" ของคุณไม่สามารถยาวเกิน %1 ตัวอักษร(s) ได้", "cant-chat-with-yourself": "คุณไม่สามารถแชทกับตัวเองได้นะ!", "chat-restricted": "ผู้ใช้นี้ถูกจำกัดข้อความแชท เขาต้องติดตามคุณก่อน คุณจึงจะสามารถแชทกับเขาได้", + "chat-user-blocked": "คุณถูกบล็อกโดยผู้ใช้คนนี้", "chat-disabled": "ระบบแชทถูกปิดใช้งาน", "too-many-messages": "คุณได้ส่งข้อความมากเกินไป กรุณารอสักครู่", "invalid-chat-message": "ข้อความแชทไม่ถูกต้อง", diff --git a/public/language/th/global.json b/public/language/th/global.json index f5aac99b63..e594121bd5 100644 --- a/public/language/th/global.json +++ b/public/language/th/global.json @@ -134,7 +134,7 @@ "unsaved-changes": "การเปลี่ยนแปลงของคุณจะไม่ได้รับการบันทึก คุณแน่ใจหรือว่าต้องการออกจากที่นี่?", "reconnecting-message": "เหมือนกับว่าการเชื่อมต่อของคุณเพื่อไปยัง %1 นั้นขาดหาย กรุณารอสักครู่ เรากำลังพยายามเชื่อมต่อใหม่", "play": "เล่น", - "cookies.message": "เว็บไวต์นี้ใช้คุกกี้เพื่อที่จะทำให้แน่ใจว่า คุณได้รับประสบการณ์ที่เยี่ยมยอดที่สุดในการเข้าใช้เว็บไซต์ของเรา", + "cookies.message": "เว็บไซต์นี้ใช้คุกกี้เพื่อที่จะทำให้แน่ใจว่า คุณได้รับประสบการณ์ที่เยี่ยมยอดที่สุดในการเข้าใช้เว็บไซต์ของเรา", "cookies.accept": "เข้าใจแล้ว!!!", "cookies.learn-more": "เรียนรู้เพิ่มเติม", "edited": "ถูกแก้ไขแล้ว", diff --git a/public/language/th/modules.json b/public/language/th/modules.json index 2a3ae08a34..bbabe4b7c7 100644 --- a/public/language/th/modules.json +++ b/public/language/th/modules.json @@ -1,12 +1,13 @@ { "chat.room-id": "ห้อง %1", "chat.chatting-with": "คุยกับ", - "chat.placeholder": "พิมพ์ข้อความแชทที่นี้ ลากและปล่อยรูปภาพ กดปุ่ม enter เพื่อส่ง", - "chat.placeholder.mobile": "พิมพ์ข้อความแชทที่นี่", + "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/notifications.json b/public/language/th/notifications.json index b367a012fb..4c0996ea8d 100644 --- a/public/language/th/notifications.json +++ b/public/language/th/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 และอีก %3 คน ได้โพสต์คำตอบไปยัง %4", "user-posted-topic": "%1ได้โพสต์กระทู้ใหม่ : %2", "user-edited-post": "%1 ได้แก้ไขโพสต์ใน %2", - "user-posted-topic-with-tag": "%1 ได้โพสต์กระทู้ใหม่ที่ติดแท็ก %2", - "user-posted-topic-with-tag-dual": "%1 ได้โพสต์กระทู้ใหม่ที่ติดแท็ก %2 และ %3", - "user-posted-topic-with-tag-triple": "%1 ได้โพสต์กระทู้ใหม่ที่ติดแท็ก %2, %3 และ %4", - "user-posted-topic-with-tag-multiple": "%1 ได้โพสต์กระทู้ใหม่ที่ติดแท็ก %2", + "user-posted-topic-with-tag": "%1 ได้โพสต์ %2 (ติดแท็ก %3)", + "user-posted-topic-with-tag-dual": "%1 ได้โพสต์ %2 (ติดแท็ก %3 และ %4)", + "user-posted-topic-with-tag-triple": "%1 ได้โพสต์ %2 (ติดแท็ก %3, %4 และ %5)", + "user-posted-topic-with-tag-multiple": "%1 ได้โพสต์ %2 (ติดแท็ก %3)", "user-posted-topic-in-category": "%1 ได้โพสต์กระทู้ใหม่ใน %2", "user-started-following-you": "%1 ได้เริ่มติดตามคุณ", "user-started-following-you-dual": "%1และ%2ได้เริ่มติดตามคุณ", @@ -75,6 +75,7 @@ "email-confirmed": "อีเมลได้รับการยืนยันแล้ว", "email-confirmed-message": "ขอบคุณที่ยืนยันอีเมลของคุณ บัญชีของคุณสามารถใช้งานได้แล้ว", "email-confirm-error-message": "มีปัญหาในการยืนยันอีเมลของคุณ รหัสอาจไม่ถูกต้องหรือหมดอายุแล้ว", + "email-confirm-error-message-already-validated": "อีเมลของคุณได้รับการยืนยันไปแล้ว", "email-confirm-sent": "ส่งอีเมลยืนยันแล้ว", "none": "ไม่มี", "notification-only": "แจ้งเตือนอย่างเดียว", diff --git a/public/language/th/post-queue.json b/public/language/th/post-queue.json index 117c166ffa..21320ff288 100644 --- a/public/language/th/post-queue.json +++ b/public/language/th/post-queue.json @@ -26,7 +26,7 @@ "notify-user": "แจ้งเตือนผู้ใช้งาน", "confirm-reject": "คุณต้องการปฏิเสธโพสต์นี้หรือไม่?", "confirm-remove": "คุณต้องการลบโพสต์นี้หรือไม่??", - "bulk-actions": "คำสั่งทีละมากๆ", + "bulk-actions": "จัดการทีละมากๆ", "accept-all": "ยอมรับทั้งหมด", "accept-selected": "ยอมรับที่เลือก", "reject-all": "ปฏิเสธทั้งหมด", @@ -38,5 +38,6 @@ "remove-selected": "ลบที่เลือก", "remove-selected-confirm": "คุณต้องการลบโพสต์ที่เลือกจำนวน %1 โพสต์หรือไม่?", "bulk-accept-success": "%1 โพสต์ถูกยอมรับ", - "bulk-reject-success": "%1 โพสต์ถูกปฏิเสธ" + "bulk-reject-success": "%1 โพสต์ถูกปฏิเสธ", + "links-in-this-post": "ลิงก์ในโพสต์นี้" } \ No newline at end of file diff --git a/public/language/th/themes/harmony.json b/public/language/th/themes/harmony.json index ad25121e17..94bb567d0a 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": "แสดงแถบนำทางในหน้าหมวดหมู่และกระทู้", + "settings.enableBreadcrumbs.why": "ในหน้าส่วนใหญ่จะเห็นแถบนำทางเพื่อช่วยให้ไปที่หน้าต่างๆได้สะดวก การออกแบบหน้าหมวดหมู่และกระทู้มีวิธีกลับไปยังหน้าหลักอยู่แล้ว จึงสามารถปิดการแสดงแถบนำทางเพื่อไม่ให้หน้าดูรกเกินไป", "settings.centerHeaderElements": "ทำให้ข้อความส่วนหัวอยู่ตรงกลาง", "settings.mobileTopicTeasers": "แสดงตัวอย่างเนื้อหากระทู้บนมือถือ", "settings.stickyToolbar": "แถบเครื่องมือแบบ sticky", diff --git a/public/language/th/user.json b/public/language/th/user.json index e68b9dc4f0..710c660180 100644 --- a/public/language/th/user.json +++ b/public/language/th/user.json @@ -78,6 +78,7 @@ "change-password": "เปลี่ยนรหัสผ่าน", "change-password-error": "รหัสผ่านใช้ไม่ได้", "change-password-error-wrong-current": "รหัสผ่านปัจจุบันไม่ถูกต้อง", + "change-password-error-same-password": "รหัสผ่านของคุณเหมือนกับรหัสผ่านปัจจุบัน โปรดเลือกรหัสผ่านใหม่", "change-password-error-match": "รหัสผ่านต้องเหมือนกัน", "change-password-error-privileges": "คุณไม่มีสิทธิเปลี่ยนรหัสผ่านนี้", "change-password-success": "รหัสผ่านของคุณได้รับการแก้ไขแล้ว", @@ -170,7 +171,7 @@ "info.reported-by": "ถูกรายงานโดย:", "info.no-flags": "ไม่พบโพสต์ที่ถูกรายงาน", "info.ban-history": "ประวัติแบนล่าสุด", - "info.no-ban-history": "ผู้ใช้นี้ถูกแบนแล้ว", + "info.no-ban-history": "ผู้ใช้รายนี้ยังไม่เคยถูกแบน", "info.banned-until": "แบนจนกว่า %1", "info.banned-expiry": "หมดอายุ", "info.ban-expired": "การแบนหมดอายุ", diff --git a/public/language/th/users.json b/public/language/th/users.json index e2cb57f4ea..91872ee541 100644 --- a/public/language/th/users.json +++ b/public/language/th/users.json @@ -1,5 +1,6 @@ { "all-users": "ผู้ใช้งานทั้งหมด", + "followed-users": "ผู้ใช้งานที่ติดตาม", "latest-users": "ผู้ใช้งานล่าสุด", "top-posters": "ผู้ที่โพสต์มากที่สุด", "most-reputation": "ผู้ที่มีชื่อเสียงมากที่สุด", diff --git a/public/language/tr/admin/development/info.json b/public/language/tr/admin/development/info.json index 4aa20f221e..d1bccbc674 100644 --- a/public/language/tr/admin/development/info.json +++ b/public/language/tr/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%2ms içinde %1 düğüm yanıt verdi!", "host": "sunucu", - "primary": "ana sunucu / işlemleri gerçekleştir", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "çevrimiçi", @@ -19,6 +19,7 @@ "registered": "Kayıtlı", "sockets": "Soketler", + "connection-count": "Connection Count", "guests": "Ziyaretçiler", "info": "Bilgi" diff --git a/public/language/tr/admin/extend/widgets.json b/public/language/tr/admin/extend/widgets.json index 41e26ab4ee..ee28840a68 100644 --- a/public/language/tr/admin/extend/widgets.json +++ b/public/language/tr/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Kart", "container.card-header": "Kart Başlığı", "container.card-body": "Kart İçeriği", + "container.title": "Title", + "container.body": "Body", "container.alert": "Uyarı", "alert.confirm-delete": "Bu bileşeni silmek istediğinizden emin misiniz?", diff --git a/public/language/tr/admin/settings/reputation.json b/public/language/tr/admin/settings/reputation.json index 850e692e36..9d14776e72 100644 --- a/public/language/tr/admin/settings/reputation.json +++ b/public/language/tr/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "İtibar Ayarları", "disable": "İtibar Sistemini Devre Dışı Bırak", "disable-down-voting": "Eksi Oyu Devre Dışı Bırak", - "votes-are-public": "Tüm Oylar Herkese Açık", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Etkinlik Eşikleri", "min-rep-upvote": "Artılanan iletiler için gereken minimum itibar", "upvotes-per-day": "Artı oy günlük limiti (sınırsız artı oy için 0 giriniz)", diff --git a/public/language/tr/error.json b/public/language/tr/error.json index 5001e2807f..f044301fee 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Hakkınızda yazdıklarınız en fazla %1 karakter olabilir.", "cant-chat-with-yourself": "Kendinizle sohbet edemezsiniz!", "chat-restricted": "Bu kullanıcı sohbet ayarlarını kısıtlamış. Bu kişiye mesaj gönderebilmeniz için sizi takip etmeleri gerekiyor", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Sohbet özelliği kapalı", "too-many-messages": "Ardı ardına çok fazla mesaj yolladınız, lütfen biraz bekleyiniz.", "invalid-chat-message": "Geçersiz sohbet mesajı", diff --git a/public/language/tr/modules.json b/public/language/tr/modules.json index 61aa0841b7..53ef99d661 100644 --- a/public/language/tr/modules.json +++ b/public/language/tr/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Oda %1", "chat.chatting-with": "Sohbet", - "chat.placeholder": "Mesajı yazın veya resim sürükleyip bırakın", - "chat.placeholder.mobile": "Sohbet içeriğini buraya giriniz", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "En son yazılan mesaja geri dönün", "chat.usernames-and-x-others": "%1 & %2 başka kişi", "chat.chat-with-usernames": "%1 ile sohbet edin", diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json index 4b432e2d32..0ab796c447 100644 --- a/public/language/tr/notifications.json +++ b/public/language/tr/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 ve %3 diğer kullanıcı şu konuya ileti yazdılar: %4", "user-posted-topic": "%1 şu yeni konuyu oluşturdu: %2", "user-edited-post": "%1 şu konudaki bir iletiyi değiştirdi: %2", - "user-posted-topic-with-tag": "%1 şu etiketi kullanarak yeni bir konu oluşturdu: %2", - "user-posted-topic-with-tag-dual": "%1 şu etiketleri kullanarak yeni bir konu oluşturdu: %2 ve %3", - "user-posted-topic-with-tag-triple": "%1 şu etiketleri kullanarak yeni bir konu oluşturdu: %2, %3 ve %4", - "user-posted-topic-with-tag-multiple": "%1 şu etiketleri kullanarak yeni bir konu oluşturdu: %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 şu kategoride yeni bir başlık oluşturdu: %2", "user-started-following-you": "%1 sizi takip etmeye başladı", "user-started-following-you-dual": "%1 ve %2 sizi takip etmeye başladı.", @@ -75,6 +75,7 @@ "email-confirmed": "E-posta onaylandı", "email-confirmed-message": "E-postanızı onayladığınız için teşekkürler. Hesabınız tamamen aktif edildi.", "email-confirm-error-message": "E-posta adresinizi onaylarken bir hata oluştu. Kodunuz geçersiz ya da eski olabilir.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Onay e-postası gönderildi.", "none": "Hiçbiri", "notification-only": "Sadece Bildirim", diff --git a/public/language/tr/post-queue.json b/public/language/tr/post-queue.json index 1cb68ec41c..e643e82d46 100644 --- a/public/language/tr/post-queue.json +++ b/public/language/tr/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Seçili olanları kaldır", "remove-selected-confirm": "Seçili %1 iletiyi kaldırmak istiyor musunuz? ", "bulk-accept-success": "%1 ileti onaylandı", - "bulk-reject-success": "%1 ileti reddedildi" + "bulk-reject-success": "%1 ileti reddedildi", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/tr/user.json b/public/language/tr/user.json index 19ff16fc21..d3f9cb859f 100644 --- a/public/language/tr/user.json +++ b/public/language/tr/user.json @@ -78,6 +78,7 @@ "change-password": "Şifre Değiştir", "change-password-error": "Geçersiz Şifre", "change-password-error-wrong-current": "Şu anki şifre doğru değil!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Şifreler aynı olmalı!", "change-password-error-privileges": "Bu şifreyi değiştirme yetkiniz yok.", "change-password-success": "Şifreniz güncellendi!", diff --git a/public/language/tr/users.json b/public/language/tr/users.json index 60fd516e80..db602962b0 100644 --- a/public/language/tr/users.json +++ b/public/language/tr/users.json @@ -1,5 +1,6 @@ { "all-users": "Tüm kullanıcılar", + "followed-users": "Followed Users", "latest-users": "En Yeni Kullanıcılar", "top-posters": "En Fazla Gönderim Yapanlar", "most-reputation": "En Saygınlar", diff --git a/public/language/uk/admin/development/info.json b/public/language/uk/admin/development/info.json index c28dc7bb38..42f90c8282 100644 --- a/public/language/uk/admin/development/info.json +++ b/public/language/uk/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 вузлів відповіли за %2мс!", "host": "host", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "online", @@ -19,6 +19,7 @@ "registered": "Зареєстровано", "sockets": "Сокети", + "connection-count": "Connection Count", "guests": "Гостей", "info": "Інфо" diff --git a/public/language/uk/admin/extend/widgets.json b/public/language/uk/admin/extend/widgets.json index daa000f268..b2574ff74f 100644 --- a/public/language/uk/admin/extend/widgets.json +++ b/public/language/uk/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "Тривога", "alert.confirm-delete": "Ви впевнені, що бажаєте видалити цей віджет?", diff --git a/public/language/uk/admin/settings/reputation.json b/public/language/uk/admin/settings/reputation.json index b0da969c93..f9009085ba 100644 --- a/public/language/uk/admin/settings/reputation.json +++ b/public/language/uk/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "Налаштування репутації", "disable": "Вимкнути систему репутації", "disable-down-voting": "Вимкнути голосування проти", - "votes-are-public": "Всі голоси публічні", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "Допуски активності", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/uk/error.json b/public/language/uk/error.json index c599867465..b40f9e10b3 100644 --- a/public/language/uk/error.json +++ b/public/language/uk/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "Вибачте, але \"Про мене\" не може бути довшим за %1 символ(и).", "cant-chat-with-yourself": "Ви не можете писати самому собі!", "chat-restricted": "Цей користувач обмежив повідомлення. Він має стежити за вами, перш ніж ви зможете спілкуватися з ним", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "Чат вимкнено", "too-many-messages": "Ви надіслали забагато повідомлень, зачекайте трішки.", "invalid-chat-message": "Невірне повідомлення чату", diff --git a/public/language/uk/modules.json b/public/language/uk/modules.json index 7c61d6bea9..4c280a1356 100644 --- a/public/language/uk/modules.json +++ b/public/language/uk/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "Чат з", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/uk/notifications.json b/public/language/uk/notifications.json index 74aeed642d..ee638917a6 100644 --- a/public/language/uk/notifications.json +++ b/public/language/uk/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 запостив нову тему: %2", "user-edited-post": "%1 has edited a post in %2", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1 почав стежити за вами.", "user-started-following-you-dual": "%1 та %2 почали стежити за вами.", @@ -75,6 +75,7 @@ "email-confirmed": "Електронну пошту підтверджено", "email-confirmed-message": "Дякуємо за підтвердження електронної пошти. Ваш акаунт тепер повністю активовано.", "email-confirm-error-message": "При перевірці вашої електронної пошти сталася проблема. Можливо код був недійсним або простроченим.", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "Підтвердження по електронній пошті було надіслано.", "none": "Немає", "notification-only": "Тільки сповіщення", diff --git a/public/language/uk/post-queue.json b/public/language/uk/post-queue.json index 34399ad65f..2e727c8723 100644 --- a/public/language/uk/post-queue.json +++ b/public/language/uk/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/uk/user.json b/public/language/uk/user.json index 8f712b26e1..5d30fb6ae7 100644 --- a/public/language/uk/user.json +++ b/public/language/uk/user.json @@ -78,6 +78,7 @@ "change-password": "Змінити пароль", "change-password-error": "Невірний пароль!", "change-password-error-wrong-current": "Ваш поточний пароль не вірний!", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "Паролі мають співпадати!", "change-password-error-privileges": "У вас немає прав змінювати цей пароль.", "change-password-success": "Ваш пароль оновлено!", diff --git a/public/language/uk/users.json b/public/language/uk/users.json index 04f05b8419..397671fb7a 100644 --- a/public/language/uk/users.json +++ b/public/language/uk/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Останні користувачі", "top-posters": "Кращі автори", "most-reputation": "Найбільша репутація", diff --git a/public/language/vi/admin/admin.json b/public/language/vi/admin/admin.json index 3089b0067e..854e80eb92 100644 --- a/public/language/vi/admin/admin.json +++ b/public/language/vi/admin/admin.json @@ -1,18 +1,18 @@ { - "alert.confirm-rebuild-and-restart": "Bạn có chắc chắn muốn xây lại và khởi động lại NodeBB?", + "alert.confirm-rebuild-and-restart": "Bạn có chắc chắn muốn xây dựng lại và khởi động lại NodeBB?", "alert.confirm-restart": "Bạn có chắc muốn khởi động lại NodeBB", "acp-title": "%1 | Bảng Điểu Khiển Quản Trị NodeBB", "settings-header-contents": "Nội dung", - "changes-saved": "Changes Saved", - "changes-saved-message": "Your changes to the NodeBB configuration have been saved.", + "changes-saved": "Đã Lưu Thay Đổi", + "changes-saved-message": "Những thay đổi của bạn đối với cấu hình NodeBB đã được lưu.", "changes-not-saved": "Thay Đổi Chưa Được Lưu", "changes-not-saved-message": "NodeBB đã gặp sự cố khi lưu các thay đổi của bạn. (%1)", - "save-changes": "Save changes", - "min": "Min:", - "max": "Max:", - "view": "View", - "edit": "Edit", - "add": "Add", - "select-icon": "Select Icon" + "save-changes": "Lưu thay đổi", + "min": "Tối thiểu:", + "max": "Tối đa:", + "view": "Xem", + "edit": "Sửa", + "add": "Thêm", + "select-icon": "Chọn Biểu Tượng" } \ No newline at end of file diff --git a/public/language/vi/admin/advanced/cache.json b/public/language/vi/admin/advanced/cache.json index d06443e357..bb874c1930 100644 --- a/public/language/vi/admin/advanced/cache.json +++ b/public/language/vi/admin/advanced/cache.json @@ -1,10 +1,10 @@ { - "cache": "Cache", + "cache": "Bộ đệm", "post-cache": "Bộ Nhớ Đệm Bài Viết", "group-cache": "Bộ Nhớ Đệm Nhóm", "local-cache": "Bộ Nhớ Đệm Cục Bộ", "object-cache": "Bộ Nhớ Đệm Đối Tượng", "percent-full": "%1% Đầy", - "post-cache-size": "Kích thước cache bài viết", - "items-in-cache": "Thành phần trong Cache" + "post-cache-size": "Kích Cỡ Bộ Đệm Bài Đăng", + "items-in-cache": "Các Mục trong Bộ Đệm" } \ No newline at end of file diff --git a/public/language/vi/admin/advanced/database.json b/public/language/vi/admin/advanced/database.json index a1ae4cd261..3197226f05 100644 --- a/public/language/vi/admin/advanced/database.json +++ b/public/language/vi/admin/advanced/database.json @@ -2,15 +2,15 @@ "x-b": "%1 b", "x-mb": "%1 mb", "x-gb": "%1 gb", - "uptime-seconds": "Thời gian hoạt động(giây)", - "uptime-days": "Thời gian hoạt động(Ngày)", + "uptime-seconds": "Hoạt động theo Giây", + "uptime-days": "Hoạt động theo Ngày", "mongo": "MongoDB", "mongo.version": "Phiên bản MongoDB ", - "mongo.storage-engine": "Phương Thức Lưu Trữ", + "mongo.storage-engine": "Công Cụ Lưu Trữ", "mongo.collections": "Tập dữ liệu", "mongo.objects": "Đối tượng", - "mongo.avg-object-size": "Kích thước trung bình", + "mongo.avg-object-size": "Kích cỡ Trung bình Đối Tượng", "mongo.data-size": "Kích thước dữ liệu", "mongo.storage-size": "Kích thước lưu trữ", "mongo.index-size": "Kích thước chỉ mục", @@ -26,14 +26,14 @@ "redis": "Redis", "redis.version": "Phiên bản Redis", - "redis.keys": "Chìa khóa", + "redis.keys": "Khóa", "redis.expires": "Hết hạn", "redis.avg-ttl": "TTL Trung Bình", "redis.connected-clients": "Khách Đã Kết Nối", "redis.connected-slaves": "Nô lệ được kết nối", "redis.blocked-clients": "Khách Xem Bị Khóa", "redis.used-memory": "Bộ Nhớ Đã Sử Dụng", - "redis.memory-frag-ratio": "Tỷ lệ phân mảnh bộ nhớ", + "redis.memory-frag-ratio": "Tỷ Lệ Phân Mảnh Bộ Nhớ", "redis.total-connections-recieved": "Tổng Số Kết Nối Nhận Được", "redis.total-commands-processed": "Tổng Số Kết Nối Được Xử Lý", "redis.iops": "Hoạt động tức thời. Môi giây", diff --git a/public/language/vi/admin/advanced/errors.json b/public/language/vi/admin/advanced/errors.json index 53789387a9..539a1ac827 100644 --- a/public/language/vi/admin/advanced/errors.json +++ b/public/language/vi/admin/advanced/errors.json @@ -1,7 +1,7 @@ { - "errors": "Errors", + "errors": "Lỗi", "figure-x": "Hình %1", - "error-events-per-day": "sự kiện mỗi ngày %1", + "error-events-per-day": "sự kiện ngày %1", "error.404": "404 Không Tìm Thấy", "error.503": "503 Dịch Vụ Không Sẵn Có", "manage-error-log": "Quản Lý Nhật Ký Lỗi", diff --git a/public/language/vi/admin/advanced/events.json b/public/language/vi/admin/advanced/events.json index 8113569d43..dc47fd286f 100644 --- a/public/language/vi/admin/advanced/events.json +++ b/public/language/vi/admin/advanced/events.json @@ -9,9 +9,9 @@ "filter-type": "Loại Sự Kiện", "filter-start": "Ngày Bắt Đầu", "filter-end": "Ngày Kết Thúc", - "filter-user": "Filter by User", - "filter-user.placeholder": "Type user name to filter...", - "filter-group": "Filter by Group", - "filter-group.placeholder": "Type group name to filter...", + "filter-user": "Lọc theo Người Dùng", + "filter-user.placeholder": "Nhập tên người dùng để lọc...", + "filter-group": "Lọc theo Nhóm", + "filter-group.placeholder": "Nhập tên nhóm để lọc...", "filter-per-page": "Mỗi Trang" } \ No newline at end of file diff --git a/public/language/vi/admin/appearance/customise.json b/public/language/vi/admin/appearance/customise.json index 5613f36d8b..566f693fb0 100644 --- a/public/language/vi/admin/appearance/customise.json +++ b/public/language/vi/admin/appearance/customise.json @@ -1,20 +1,20 @@ { - "customise": "Customise", + "customise": "Tùy chỉnh", "custom-css": "CSS/SASS Tùy Chỉnh", "custom-css.description": "Nhập các khai báo CSS/SASS của riêng bạn tại đây, sẽ được áp dụng sau tất cả các kiểu khác.", "custom-css.enable": "Bật CSS/SASS Tùy Chỉnh", "custom-js": "Javascript tùy chỉnh", "custom-js.description": "Nhập javascript của riêng bạn ở đây. Nó sẽ được thực hiện sau khi trang được tải hoàn toàn.", - "custom-js.enable": "Bật Javascript tùy chỉnh", + "custom-js.enable": "Bật Javascript Tùy Chỉnh", "custom-header": "Tùy Chỉnh Phần Đầu Trang", - "custom-header.description": "Nhập HTML tùy chỉnh tại đây (VD: Thẻ Meta, v.v...), sẽ được thêm vào phần <head>. Thẻ Script được phép, nhưng không được khuyến khích, vì phần Tùy Chỉnh Javascript đã có sẵn.", + "custom-header.description": "Nhập HTML tùy chỉnh ở đây (VD: Thẻ Meta, v.v...), sẽ được thêm vào phần <head>. Thẻ Script được phép, nhưng không được khuyến khích, vì phần Tùy Chỉnh Javascript đã có sẵn.", "custom-header.enable": "Bật Tùy Chỉnh Phần Đầu Trang", "custom-css.livereload": "Bật tải lại trực tiếp", "custom-css.livereload.description": "Bật điều này để buộc tất cả các phiên trên mọi thiết bị trong tài khoản của bạn phải làm mới bất cứ khi nào bạn nhấp vào lưu", "bsvariables": "_variables.scss", - "bsvariables.description": "Override bootstrap variables here. You can also use a tool like bootstrap.build and paste the output here.
Changes require a rebuild & restart.", - "bsvariables.enable": "Enable _variables.scss" + "bsvariables.description": "Ghi đè các biến bootstrap ở đây. Bạn có thể sử dụng công cụ như bootstrap.build và dán đầu ra ở đây.
Thay đổi buộc dựng lại và chạy lại.", + "bsvariables.enable": "Bật _variables.scss" } \ No newline at end of file diff --git a/public/language/vi/admin/appearance/skins.json b/public/language/vi/admin/appearance/skins.json index d018f971c3..a3a7ca9392 100644 --- a/public/language/vi/admin/appearance/skins.json +++ b/public/language/vi/admin/appearance/skins.json @@ -1,18 +1,18 @@ { - "skins": "Giao diện", - "bootswatch-skins": "Giao Diện Đồng Hồ Khởi Động", - "custom-skins": "Giao Diện Tùy Chỉnh", - "add-skin": "Thêm Giao Diện", - "save-custom-skins": "Lưu Giao Diện Tùy Chỉnh", - "save-custom-skins-success": "Giao diện tùy chỉnh đã được lưu thành công", - "custom-skin-name": "Tên Giao Diện Tùy Chỉnh", - "custom-skin-variables": "Biến Số Giao Diện Tùy Chỉnh", - "loading": "Đang Tải Giao Diện ...", + "skins": "Trang điểm", + "bootswatch-skins": "Trang Điểm Đồng Hồ Khởi Động", + "custom-skins": "Trang Điểm Tùy Chỉnh", + "add-skin": "Thêm Trang Điểm", + "save-custom-skins": "Lưu Trang Điểm Tùy Chỉnh", + "save-custom-skins-success": "Trang điểm tùy chỉnh đã lưu thành công", + "custom-skin-name": "Tên Trang Điểm Tùy Chỉnh", + "custom-skin-variables": "Biến Số Trang Điểm Tùy Chỉnh", + "loading": "Đang Tải Trang Điểm...", "homepage": "Trang chủ", - "select-skin": "Chọn Giao Diện", - "revert-skin": "Hoàn Nguyên Giao Diện", - "current-skin": "Giao Diện Hiện Tại", - "skin-updated": "Đã Cập Nhật Giao Diện", - "applied-success": "%1 giao diện đã được sử dụng thành công", - "revert-success": "Đã trả giao diện về màu cơ bản" + "select-skin": "Chọn Trang Điểm", + "revert-skin": "Hoàn Nguyên Trang Điểm", + "current-skin": "Trang Điểm Hiện Tại", + "skin-updated": "Đã Cập Nhật Trang Điểm", + "applied-success": "%1 trang điểm sử dụng thành công", + "revert-success": "Đã trả trang điểm về màu cơ bản" } \ No newline at end of file diff --git a/public/language/vi/admin/appearance/themes.json b/public/language/vi/admin/appearance/themes.json index 574c558b49..bd3d096acd 100644 --- a/public/language/vi/admin/appearance/themes.json +++ b/public/language/vi/admin/appearance/themes.json @@ -1,13 +1,13 @@ { - "themes": "Themes", + "themes": "Giao diện", "checking-for-installed": "Đang kiểm tra các giao diện đã cài đặt...", "homepage": "Trang chủ", "select-theme": "Chọn Giao Diện", - "revert-theme": "Revert Theme", + "revert-theme": "Hoàn Nguyên Chủ Đề", "current-theme": "Giao Diện Hiện Tại", "no-themes": "Không tìm thấy giao diện đã cài đặt", "revert-confirm": "Bạn có chắc muốn khôi phục giao diện NodeBB mặc định không?", "theme-changed": "Đã Đổi Giao Diện", "revert-success": "Bạn đã thành công trả lại NodeBB của mình trở về giao diện mặc định.", - "restart-to-activate": "Vui lòng xây dựng lại và khởi động lại NodeBB của bạn để kích hoạt đầy đủ giao diện này." + "restart-to-activate": "Hãy dựng lại và chạy lại NodeBB để kích hoạt toàn bộ giao diện này." } \ No newline at end of file diff --git a/public/language/vi/admin/dashboard.json b/public/language/vi/admin/dashboard.json index 78ed4ec60d..11e81265b2 100644 --- a/public/language/vi/admin/dashboard.json +++ b/public/language/vi/admin/dashboard.json @@ -9,7 +9,7 @@ "page-views-seven": "7 ngày trước", "page-views-thirty": "30 ngày trước", "page-views-last-day": "24 giờ trước", - "page-views-custom": "Tùy chỉnh phạm vi ngày", + "page-views-custom": "Tùy Chỉnh Phạm Vi Ngày", "page-views-custom-start": "Phạm vi bắt đầu", "page-views-custom-end": "Phạm vi kết thúc", "page-views-custom-help": "Nhập phạm vi ngày mà bạn muốn xem lượt xem trang. Nếu không có bộ chọn ngày, chấp nhận định dạng là YYYY-MM-DD", @@ -42,10 +42,10 @@ "search-plugin-tooltip": "Cài đặt một plugin tìm kiếm từ trang plugin để kích hoạt chức năng tìm kiếm", "control-panel": "Điều khiển hệ thống", - "rebuild-and-restart": "Xây Dựng Lại & Khởi Động Lại", - "restart": "Khởi động lại", - "restart-warning": "Xây dựng lại hoặc Khởi động lại NodeBB của bạn sẽ hủy tất cả các kết nối hiện có trong vài giây.", - "restart-disabled": "Việc xây dựng lại và khởi động lại NodeBB của bạn đã bị vô hiệu hóa vì bạn dường như không chạy nó qua daemon thích hợp.", + "rebuild-and-restart": "Dựng lại & Chạy lại", + "restart": "Chạy lại", + "restart-warning": "Dựng lại hay Chạy lại NodeBB của bạn sẽ hủy tất cả các kết nối hiện có trong vài giây.", + "restart-disabled": "Dựng lại và Chạy lại NodeBB của bạn đã bị vô hiệu hóa vì bạn dường như không chạy nó qua daemon thích hợp.", "maintenance-mode": "Chế Độ Bảo Trì", "maintenance-mode-title": "Bấm vào đây để thiết lập chế độ bảo trì cho NodeBB", "dark-mode": "Chế Độ Tối", @@ -62,7 +62,7 @@ "registered": "Đã đăng ký", "user-presence": "Người Dùng Có Mặt", - "on-categories": "Trên Danh Sách Chuyên Mục", + "on-categories": "Trên danh sách danh mục", "reading-posts": "Đọc bài viết", "browsing-topics": "Duyệt qua chủ đề", "recent": "Gần đây", @@ -86,16 +86,16 @@ "details.no-topics": "Không có chủ đề nào được đăng trong khung thời gian đã chọn", "details.no-searches": "Không có tìm kiếm nào được thực hiện trong khung thời gian đã chọn", "details.no-logins": "Không có thông tin đăng nhập nào được ghi lại trong khung thời gian đã chọn", - "details.logins-static": "NodeBB chỉ lưu dữ liệu phiên trong %1 ngày và do đó, bảng này bên dưới sẽ chỉ hiển thị các phiên hoạt động gần đây nhất", + "details.logins-static": "NodeBB chỉ lưu dữ liệu phiên trong %1 ngày, bảng bên dưới chỉ hiển thị các phiên hoạt động gần đây nhất", "details.logins-login-time": "Thời gian đăng nhập", "start": "Bắt đầu", "end": "Kết thúc", "filter": "Bộ lọc", - "view-as-json": "Xem dưới dạng JSON", + "view-as-json": "Xem kiểu JSON", "expand-analytics": "Mở rộng phân tích", "clear-search-history": "Xóa lịch sử tìm kiếm", "clear-search-history-confirm": "Bạn có chắc chắn muốn xóa toàn bộ lịch sử tìm kiếm không?", - "search-term": "Term", - "search-count": "Count", - "view-all": "View all" + "search-term": "Cụm từ", + "search-count": "Số lần", + "view-all": "Xem tất cả" } diff --git a/public/language/vi/admin/development/info.json b/public/language/vi/admin/development/info.json index 4a76411c21..f8e2480b94 100644 --- a/public/language/vi/admin/development/info.json +++ b/public/language/vi/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1 nút đã phản hồi trong %2ms!", "host": "máy chủ", - "primary": "công việc chính/điều hành", + "primary": "chính / công việc", "pid": "pid", "nodejs": "nodejs", "online": "trực tuyến", @@ -19,6 +19,7 @@ "registered": "Đã đăng ký", "sockets": "Sockets", + "connection-count": "Số Lượng Kết Nối", "guests": "Khách", "info": "Thông tin" diff --git a/public/language/vi/admin/development/logger.json b/public/language/vi/admin/development/logger.json index 0fd7dc3d28..bbe6db943a 100644 --- a/public/language/vi/admin/development/logger.json +++ b/public/language/vi/admin/development/logger.json @@ -1,7 +1,7 @@ { - "logger": "Logger", + "logger": "Ghi Nhật Ký", "logger-settings": "Cài Đặt Ghi Nhật Ký", - "description": "Bật cái này, bạn sẽ nhận nhật ký ở công cụ dòng lệnh của bạn. Nếu có đường dẫn cụ thể, nhật ký sẽ được lưu vào một tệp thay thế. Ghi nhật ký HTTP có lợi để thu thập thống kê về ai, khi nào và những gì mọi người truy cập trên diễn đàn. Ngoài ghi nhật ký yêu cầu HTTP, chúng tôi có thể ghi nhật ký sự kiện socket.io. Ghi nhật ký Socket.io, kết hợp với màn hình redis-cli, có thể hữu ích để tìm hiểu nội bộ NodeBB.", + "description": "Bật cái này, bạn sẽ nhận nhật ký ở công cụ dòng lệnh của bạn. Nếu có đường dẫn cụ thể, nhật ký sẽ được lưu vào một tệp thay thế. Nhật ký HTTP có lợi để thu thập thống kê ai đó, khi nào và những gì họ làm diễn đàn. Ngoài ghi nhật ký yêu cầu HTTP, chúng ta có thể ghi nhật ký sự kiện socket.io. Ghi nhật ký Socket.io, kết hợp giám sát redis-cli, có thể hữu ích để tìm hiểu bên trong NodeBB.", "explanation": "Chỉ cần chọn/bỏ chọn cài đặt ghi nhật ký để bật hoặc tắt ghi nhật ký một cách nhanh chóng. Không cần khởi động lại.", "enable-http": "Bật ghi nhật ký HTTP", "enable-socket": "Bật ghi nhật ký sự kiện socket.io", diff --git a/public/language/vi/admin/extend/plugins.json b/public/language/vi/admin/extend/plugins.json index 09a7817bf6..6716e75d18 100644 --- a/public/language/vi/admin/extend/plugins.json +++ b/public/language/vi/admin/extend/plugins.json @@ -15,7 +15,7 @@ "reorder-plugins": "Sắp Xếp Lại Plugin", "order-active": "Sắp Xếp Plugin Hoạt Động", "dev-interested": "Bạn quan tâm đến việc viết plugin cho NodeBB?", - "docs-info": "Tài liệu đầy đủ về tác giả plugin có thể được tìm thấy trong Cổng Thông Tin Tài Liệu NodeBB .", + "docs-info": "Tài liệu đầy đủ về tác giả plugin có thể được tìm thấy trong Cổng Tài Liệu NodeBB .", "order.description": "Một số plugin nhất định hoạt động lý tưởng khi chúng được khởi tạo trước / sau các plugin khác.", "order.explanation": "Các plugin tải theo thứ tự đã đặt ra ở đây, từ trên xuống dưới", @@ -40,9 +40,9 @@ "alert.upgraded": "Đã Nâng Cấp Plugin", "alert.installed": "Đã Cài Đặt Plugin", "alert.uninstalled": "Đã Gỡ Bỏ Plugin", - "alert.activate-success": "Vui lòng xây dựng lại và khởi động lại NodeBB của bạn để kích hoạt hoàn toàn plugin này", + "alert.activate-success": "Hãy dựng lại và chạy lại NodeBB của bạn để kích hoạt plugin này", "alert.deactivate-success": "Đã hủy kích hoạt plugin thành công", - "alert.upgrade-success": "Vui lòng xây dựng lại và khởi động lại NodeBB của bạn để nâng cấp đầy đủ plugin này.", + "alert.upgrade-success": "Hãy dựng lại và chạy lại NodeBB của bạn để nâng cấp plugin này.", "alert.install-success": "Đã cài đặt thành công plugin, vui lòng kích hoạt plugin.", "alert.uninstall-success": "Đã hủy kích hoạt và gỡ cài đặt plugin thành công.", "alert.suggest-error": "

NodeBB không thể tiếp cận trình quản lý gói, hãy tiến hành cài đặt phiên bản mới nhất?

Máy chủ trả về (%1): %2
", @@ -50,7 +50,7 @@ "alert.incompatible": "

Phiên bản NodeBB (v%1) của bạn chỉ được xóa để nâng cấp lên v%2 của plugin này. Vui lòng cập nhật NodeBB của bạn nếu muốn cài đặt phiên bản mới hơn của plugin này.

", "alert.possibly-incompatible": "

Không Có Thông Tin Tương Thích

Plugin này không đưa ra một phiên bản cụ thể để cài đặt với phiên bản NodeBB của bạn. Không đảm bảo khả năng tương thích hoàn toàn và có thể khiến NodeBB của bạn không hoạt động bình thường.

Trường hợp NodeBB không thể hoạt động đúng:

$ ./nodebb reset plugin=\"%1\"

Tiếp tục cài đặt phiên bản mới nhất của plugin này?

", "alert.reorder": "Các Plugin Đã Được Sắp Xếp Lại", - "alert.reorder-success": "Vui lòng xây dựng lại và khởi động lại NodeBB của bạn để hoàn tất quá trình.", + "alert.reorder-success": "Hãy dựng lại và chạy lại NodeBB của bạn để hoàn tất quá trình.", "license.title": "Thông Tin Cấp Phép Plugin", "license.intro": "Plugin %1 được cấp phép theo %2. Vui lòng đọc và hiểu các điều khoản cấp phép trước khi kích hoạt plugin này.", diff --git a/public/language/vi/admin/extend/rewards.json b/public/language/vi/admin/extend/rewards.json index bbb0c9d22d..ba946f9af6 100644 --- a/public/language/vi/admin/extend/rewards.json +++ b/public/language/vi/admin/extend/rewards.json @@ -1,12 +1,12 @@ { "rewards": "Phần thưởng", - "add-reward": "Add reward", + "add-reward": "Thêm phần thưởng", "condition-if-users": "Nếu Người Dùng", "condition-is": "Là:", "condition-then": "Sau đó:", "max-claims": "Số lần nhận thưởng có thể nhận được", "zero-infinite": "Nhập 0 cho vô hạn", - "select-reward": "Select reward", + "select-reward": "Chọn phần thưởng", "delete": "Xóa", "enable": "Bật", "disable": "Tắt", diff --git a/public/language/vi/admin/extend/widgets.json b/public/language/vi/admin/extend/widgets.json index 271ee1eede..e5b3d4a09b 100644 --- a/public/language/vi/admin/extend/widgets.json +++ b/public/language/vi/admin/extend/widgets.json @@ -1,5 +1,5 @@ { - "widgets": "Widgets", + "widgets": "Tiện ích", "available": "Tiện ích có sẵn", "explanation": "Chọn một tiện ích từ menu thả xuống, sau đó kéo và thả nó vào khu vực tiện ích của mẫu ở bên trái.", "none-installed": "Không tìm thấy tiện ích nào! Kích hoạt plugin tiện ích cần thiết trong bảng điều khiểnplugins .", @@ -12,6 +12,8 @@ "container.card": "Thẻ", "container.card-header": "Đầu Thẻ", "container.card-body": "Thân Thẻ", + "container.title": "Tiêu đề", + "container.body": "Thân", "container.alert": "Cảnh báo", "alert.confirm-delete": "Bạn có chắc muốn xóa tiện ích này không?", diff --git a/public/language/vi/admin/manage/admins-mods.json b/public/language/vi/admin/manage/admins-mods.json index c29516bd31..f74258ee68 100644 --- a/public/language/vi/admin/manage/admins-mods.json +++ b/public/language/vi/admin/manage/admins-mods.json @@ -1,13 +1,13 @@ { - "manage-admins-and-mods": "Manage Admins & Mods", + "manage-admins-and-mods": "Quản lý Quản Trị Viên & Người Điều Hành", "administrators": "Quản Trị Viên", - "global-moderators": "Người Quản Lý Chung", + "global-moderators": "Người Điều Hành Chung", "moderators": "Người điều hành", - "no-global-moderators": "Không Có Người Quản Lý Chung", + "no-global-moderators": "Không Có Người Điều Hành Chung", "no-sub-categories": "Không có danh mục phụ", "view-children": "Xem con (%1)", "no-moderators": "Không Có Người Điều Hành", "add-administrator": "Thêm Quản Trị Viên", - "add-global-moderator": "Thêm Người Quản Lý Chung", + "add-global-moderator": "Thêm Người Điều Hành Chung", "add-moderator": "Thêm Người Điều Hành" } \ No newline at end of file diff --git a/public/language/vi/admin/manage/categories.json b/public/language/vi/admin/manage/categories.json index d12779ddff..07352e45c8 100644 --- a/public/language/vi/admin/manage/categories.json +++ b/public/language/vi/admin/manage/categories.json @@ -17,7 +17,7 @@ "subcategories-per-page": "Danh mục phụ mỗi trang", "is-section": "Coi danh mục này như một phần", "post-queue": "Xếp hàng bài đăng", - "tag-whitelist": "Danh Sách Trắng Gắn Thẻ ", + "tag-whitelist": "Danh Sách Trắng Thẻ", "upload-image": "Tải Lên Ảnh", "upload": "Tải lên", "delete-image": "Xóa", diff --git a/public/language/vi/admin/manage/digest.json b/public/language/vi/admin/manage/digest.json index 80010b7fb1..0a3af43dfb 100644 --- a/public/language/vi/admin/manage/digest.json +++ b/public/language/vi/admin/manage/digest.json @@ -1,13 +1,13 @@ { "lead": "Một danh sách các số liệu thống kê và thời gian phân phối được hiển thị dưới đây.", - "disclaimer": "Xin lưu ý rằng việc gửi email không được đảm bảo, do bản chất của công nghệ email. Nhiều yếu tố quyết định đến việc liệu một email được gửi đến máy chủ người nhận cuối cùng có được gửi đến hộp thư đến của người dùng hay không, bao gồm danh tiếng của máy chủ, địa chỉ IP nằm trong danh sách đen và liệu DKIM/SPF/DMARC được cấu hình.", + "disclaimer": "Lưu ý việc gửi email là không đảm bảo, do bản chất của công nghệ email. Nhiều yếu tố ảnh hưởng đến một email được gửi đến máy chủ người nhận cuối cùng có được gửi đến hộp thư của người dùng hay không, bao gồm danh tiếng máy chủ, địa chỉ IP nằm trong danh sách đen và liệu DKIM/SPF/DMARC được cấu hình.", "disclaimer-continued": "Gửi thành công nghĩa là tin nhắn được NodeBB gửi thành công và máy chủ người nhận nhận được. Nó không có nghĩa là email đã đến hộp thư đến. Để có kết quả tốt nhất, chúng tôi khuyên bạn nên sử dụng dịch vụ gửi email của bên thứ ba, chẳng hạn như SendGrid.", "user": "Người dùng", - "subscription": "Loại đăng ký", + "subscription": "Loại Đăng Ký", "last-delivery": "Gửi thành công lần cuối", "default": "Mặc định hệ thống", - "default-help": "Mặc định hệ thống nghĩa là người dùng không đè lên toàn bộ cài đặt thông báo diễn đàn, hiện là: "%1"", + "default-help": "Mặc định hệ thống nghĩa là người dùng không ghi đè lên toàn bộ cài đặt thông báo diễn đàn, hiện là: "%1"", "resend": "Gửi Lại Thông Báo", "resend-all-confirm": "Bạn có muốn thực hiện thủ công lần chạy thông báo này không?", "resent-single": "Đã hoàn tất gửi lại thông báo thủ công", diff --git a/public/language/vi/admin/manage/privileges.json b/public/language/vi/admin/manage/privileges.json index fbe4434e79..27f999cff3 100644 --- a/public/language/vi/admin/manage/privileges.json +++ b/public/language/vi/admin/manage/privileges.json @@ -1,7 +1,7 @@ { "manage-privileges": "Quản Lý Đặc Quyền", "discard-changes": "Loại bỏ các thay đổi", - "global": "Chung", + "global": "Toàn bộ", "admin": "Quản Trị Viên", "group-privileges": "Đặc Quyền Nhóm", "user-privileges": "Đặc Quyền Người Dùng", @@ -32,7 +32,7 @@ "schedule-topics": "Lên Lịch Chủ Đề", "tag-topics": "Gắn Thẻ Chủ Đề", "edit-posts": "Chỉnh Sửa Bài Đăng", - "view-edit-history": "Xem Lịch Sử Chỉnh Sửa", + "view-edit-history": "Xem Lịch Sử Sửa", "delete-posts": "Xóa Bài Đăng", "view-deleted": "Xem Bài Viết Đã Xóa", "upvote-posts": "Ủng Hộ Bài Đăng", diff --git a/public/language/vi/admin/manage/registration.json b/public/language/vi/admin/manage/registration.json index adc7ff9d32..b30cde0329 100644 --- a/public/language/vi/admin/manage/registration.json +++ b/public/language/vi/admin/manage/registration.json @@ -11,7 +11,7 @@ "list.ip-spam": "Tần suất: %1 Xuất hiện: %2", "invitations": "Lời mời", - "invitations.description": "Dưới đây là danh sách hoàn tất các lời mời đã gửi. Bấm ctrl-f để tìm kiếm trong danh sách bằng email hoặc tên đăng nhập.

Tên đăng nhập sẽ được hiển thị bên phải email cho những người dùng đã đổi lời mời của họ.", + "invitations.description": "Dưới đây là danh sách hoàn tất các lời mời đã gửi. Bấm ctrl-f để tìm kiếm trong danh sách bằng email hoặc tên đăng nhập.

Tên đăng nhập sẽ hiển thị bên phải email cho những người dùng đã đổi lời mời của họ.", "invitations.inviter-username": "Tên Đăng Nhập Người Mời", "invitations.invitee-email": "Email của người được mời", "invitations.invitee-username": "Tên Đăng Nhập Người Được Mời (nếu đã đăng ký)", diff --git a/public/language/vi/admin/manage/tags.json b/public/language/vi/admin/manage/tags.json index fb6d662a87..64f00d35e0 100644 --- a/public/language/vi/admin/manage/tags.json +++ b/public/language/vi/admin/manage/tags.json @@ -1,5 +1,5 @@ { - "manage-tags": "Quản lý thẻ", + "manage-tags": "Quản Lý Thẻ", "none": "Diễn đàn của bạn chưa có bất kỳ chủ đề nào gắn thẻ.", "bg-color": "Màu Nền", "text-color": "Màu Chữ", diff --git a/public/language/vi/admin/manage/uploads.json b/public/language/vi/admin/manage/uploads.json index 2df6f9ba9d..32f4d447e3 100644 --- a/public/language/vi/admin/manage/uploads.json +++ b/public/language/vi/admin/manage/uploads.json @@ -2,11 +2,11 @@ "manage-uploads": "Quản Lý Tải Lên", "upload-file": "Tải Lên Tệp", "filename": "Tên Tệp", - "usage": "Đăng sử dụng", + "usage": "Dùng Bài Đăng", "orphaned": "Đơn độc", - "size/filecount": "Kích cỡ/ Số lượng tệp", + "size/filecount": "Kích cỡ/ Số tệp", "confirm-delete": "Bạn có chắc muốn xóa tệp này không?", "filecount": "%1 tệp", - "new-folder": "Thư mục mới", + "new-folder": "Thư Mục Mới", "name-new-folder": "Nhập tên cho thư mục mới" } \ No newline at end of file diff --git a/public/language/vi/admin/manage/users.json b/public/language/vi/admin/manage/users.json index ce47082f43..010419c48e 100644 --- a/public/language/vi/admin/manage/users.json +++ b/public/language/vi/admin/manage/users.json @@ -28,7 +28,7 @@ "create": "Tạo Người Dùng", "invite": "Mời qua Email", "new": "Người Dùng Mới", - "filter-by": "Lọc bởi", + "filter-by": "Lọc theo", "pills.unvalidated": "Không Hợp Lệ", "pills.validated": "Đã xác thực", "pills.banned": "Bị cấm", @@ -61,7 +61,7 @@ "users.validation-pending": "Đang Chờ Xác Thực", "users.validation-expired": "Đã Hết Hạn Xác Thực", "users.ip": "IP", - "users.postcount": "số lượng bài viết", + "users.postcount": "số bài", "users.reputation": "uy tín", "users.flags": "gắn cờ", "users.joined": "đã tham gia", @@ -92,9 +92,9 @@ "alerts.make-admin-success": "Người dùng hiện là quản trị viên.", "alerts.confirm-remove-admin": "Bạn có chắc muốn xóa quản trị viên này không?", "alerts.remove-admin-success": "Người dùng không còn là quản trị viên.", - "alerts.make-global-mod-success": "Người dùng hiện là người quản lý chung.", - "alerts.confirm-remove-global-mod": "Bạn có thực sự muốn xóa người quản lý chung này không?", - "alerts.remove-global-mod-success": "Người dùng không còn là người quản lý chung.", + "alerts.make-global-mod-success": "Người dùng hiện là người điều hành chung.", + "alerts.confirm-remove-global-mod": "Bạn có chắc muốn xóa người điều hành chung này không?", + "alerts.remove-global-mod-success": "Người dùng không còn là người điều hành chung.", "alerts.make-moderator-success": "Người dùng hiện là người điều hành.", "alerts.confirm-remove-moderator": "Bạn có thực sự muốn xóa người kiểm duyệt này không?", "alerts.remove-moderator-success": "Người dùng không còn là người điều hành.", @@ -121,29 +121,29 @@ "alerts.email-sent-to": "Email mời đã được gửi đến %1", "alerts.x-users-found": "Tìm được %1 người dùng (%2 giây)", "alerts.select-a-single-user-to-change-email": "Chọn một người dùng để thay đổi email", - "export": "Export", - "export-users-fields-title": "Select CSV Fields", + "export": "Xuất", + "export-users-fields-title": "Chọn trường CSV", "export-field-email": "Email", - "export-field-username": "Username", + "export-field-username": "Tên đăng nhập", "export-field-uid": "UID", "export-field-ip": "IP", - "export-field-joindate": "Join date", - "export-field-lastonline": "Last Online", - "export-field-lastposttime": "Last Post Time", - "export-field-reputation": "Reputation", - "export-field-postcount": "Post Count", - "export-field-topiccount": "Topic Count", - "export-field-profileviews": "Profile Views", - "export-field-followercount": "Follower Count", - "export-field-followingcount": "Following Count", - "export-field-fullname": "Full Name", - "export-field-website": "Website", - "export-field-location": "Location", - "export-field-birthday": "Birthday", - "export-field-signature": "Signature", - "export-field-aboutme": "About Me", + "export-field-joindate": "Ngày tham gia", + "export-field-lastonline": "Trực Tuyến Lần Cuối", + "export-field-lastposttime": "Lần Đăng Cuối", + "export-field-reputation": "Uy tín", + "export-field-postcount": "Số Bài Đăng", + "export-field-topiccount": "Số Chủ Đề", + "export-field-profileviews": "Xem Hồ Sơ", + "export-field-followercount": "Người Theo Dõi", + "export-field-followingcount": "Đang Theo Dõi", + "export-field-fullname": "Tên Đầy Đủ", + "export-field-website": "Trang web", + "export-field-location": "Nơi ở", + "export-field-birthday": "Ngày sinh", + "export-field-signature": "Chữ ký", + "export-field-aboutme": "Thông Tin Cá Nhân", - "export-users-started": "Xuất người dùng dưới dạng csv, quá trình này có thể mất một lúc. Bạn sẽ nhận được thông báo khi hoàn tất.", + "export-users-started": "Xuất người dùng dưới dạng csv, sẽ tốn thời gian. Bạn sẽ nhận được thông báo khi hoàn tất.", "export-users-completed": "Đã xuất người dùng ra csv, bấm vào đây tải xuống.", "email": "Email", "password": "Mật khẩu", diff --git a/public/language/vi/admin/menu.json b/public/language/vi/admin/menu.json index 857588ff72..bda3bf2abf 100644 --- a/public/language/vi/admin/menu.json +++ b/public/language/vi/admin/menu.json @@ -1,6 +1,6 @@ { "section-dashboard": "Bảng điều khiển", - "dashboard/overview": "Tổng quát", + "dashboard/overview": "Tổng quan", "dashboard/logins": "Đăng nhập", "dashboard/users": "Người dùng", "dashboard/topics": "Chủ đề", @@ -14,7 +14,7 @@ "manage/users": "Người dùng", "manage/admins-mods": "Quản trị viên & Người điều hành", "manage/registration": "Xếp Hàng Đăng Ký", - "manage/flagged-content": "Flagged Content", + "manage/flagged-content": "Nội Dung Bị Gắn Cờ", "manage/post-queue": "Xếp Hàng Bài Đăng", "manage/groups": "Nhóm", "manage/ip-blacklist": "Danh sách đen IP", @@ -49,7 +49,7 @@ "section-appearance": "Trực quan", "appearance/themes": "Giao diện", - "appearance/skins": "Giao diện", + "appearance/skins": "Trang điểm", "appearance/customise": "Nội dung tùy chỉnh (HTML/JS/CSS)", "section-extend": "Mở rộng", @@ -72,12 +72,12 @@ "development/logger": "Ghi nhật ký", "development/info": "Thông tin", - "rebuild-and-restart-forum": "Xây dựng lại & Khởi động lại diễn đàn", - "rebuild-and-restart": "Rebuild & Restart", - "restart-forum": "Khởi Động Lại Diễn Đàn", - "restart": "Restart", + "rebuild-and-restart-forum": "Dựng lại & Chạy lại diễn đàn", + "rebuild-and-restart": "Dựng lại & Chạy lại", + "restart-forum": "Chạy Lại Diễn Đàn", + "restart": "Chạy lại", "logout": "Đăng xuất", - "view-forum": "Xem diễn đàn", + "view-forum": "Xem Diễn Đàn", "search.placeholder": "Cài đặt tìm kiếm", "search.no-results": "Ko có kết quả...", diff --git a/public/language/vi/admin/settings/advanced.json b/public/language/vi/admin/settings/advanced.json index 38c9c2c5be..c802882d9c 100644 --- a/public/language/vi/admin/settings/advanced.json +++ b/public/language/vi/admin/settings/advanced.json @@ -28,10 +28,10 @@ "hsts.subdomains": "Bao gồm tên miền phụ trong phần đầu HSTS", "hsts.preload": "Cho phép tải trước phần đầu HSTS", "hsts.help": "Nếu bật, một phần đầu trang HSTS sẽ được đặt cho trang web này. Bạn có thể chọn bao gồm tên miền phụ và cờ tải trước trong phần đầu. Nếu nghi ngờ, bạn có thể bỏ chọn. Thêm thông tin ", - "traffic-management": "Quản lý lưu lượng", + "traffic-management": "Quản Lý Lưu Lượng", "traffic.help": "NodeBB dùng mô-đun tự động từ chối yêu cầu trong các tình huống có lưu lượng truy cập cao. Bạn có thể điều chỉnh các cài đặt này ở đây, mặc dù các cài đặt mặc định là một điểm khởi đầu tốt.", - "traffic.enable": "Bật quản lý lưu lượng", - "traffic.event-lag": "Ngưỡng Trễ Vòng Lặp Sự Kiện (mili giây)", + "traffic.enable": "Bật Quản Lý Lưu Lượng", + "traffic.event-lag": "Ngưỡng Trễ Vòng Lặp Sự Kiện (mili-giây)", "traffic.event-lag-help": "Giảm giá trị này sẽ giảm thời gian chờ tải trang, nhưng cũng sẽ hiển thị thông báo \"tải quá mức\" cho nhiều người dùng hơn. (Yêu cầu khởi động lại)", "traffic.lag-check-interval": "Khoảng thời gian kiểm tra (mili giây)", "traffic.lag-check-interval-help": "Việc hạ thấp giá trị này khiến NodeBB trở nên nhạy cảm hơn với tải đột biến, nhưng cũng có thể khiến kiểm tra trở nên quá nhạy. (Yêu cầu khởi động lại)", diff --git a/public/language/vi/admin/settings/api.json b/public/language/vi/admin/settings/api.json index 4cd351f0af..fb878a94b3 100644 --- a/public/language/vi/admin/settings/api.json +++ b/public/language/vi/admin/settings/api.json @@ -13,17 +13,17 @@ "token": "Token", "uid-help-text": "Ghi rõ ID người dùng liên kết với mã truy cập. Nếu ID người dùng là 0, nó sẽ là môt mã truy cập cao cấp, có thể giả định danh tính của những người dùng khác dựa trên tham số _uid", "description": "Mô tả", - "last-seen": "Last seen", - "created": "Created", - "create-token": "Create Token", - "update-token": "Update Token", - "master-token": "Master token", - "last-seen-never": "Khóa này chưa bao giờ được dùng.", + "last-seen": "Nhìn thấy lần cuối", + "created": "Đã tạo", + "create-token": "Tạo Token", + "update-token": "Cập Nhật Token", + "master-token": "Token Chính", + "last-seen-never": "Khóa này chưa bao giờ dùng.", "no-description": "Không có mô tả cụ thể.", "actions": "Hành Động", "edit": "Sửa", "roll": "Cuộn", - "delete-confirm": "Bạn có chắc chắn muốn xóa mã thông báo này không? Nó sẽ không thể phục hồi được.", - "roll-confirm": "Bạn có chắc chắn muốn tạo lại mã thông báo này không? Mã thông báo cũ sẽ bị thu hồi ngay lập tức và không thể phục hồi được." + "delete-confirm": "Bạn có chắc muốn xóa token này không? Nó không thể phục hồi.", + "roll-confirm": "Bạn có chắc muốn tạo lại token này không? Token cũ sẽ bị thu hồi ngay và không thể phục hồi được." } \ No newline at end of file diff --git a/public/language/vi/admin/settings/chat.json b/public/language/vi/admin/settings/chat.json index 8fdf0a4339..20aa9a5d6e 100644 --- a/public/language/vi/admin/settings/chat.json +++ b/public/language/vi/admin/settings/chat.json @@ -3,12 +3,12 @@ "chat-settings": "Cài Đặt Trò Chuyện", "disable": "Tắt trò chuyện", "disable-editing": "Tắt chỉnh sửa / xóa tin nhắn trò chuyện", - "disable-editing-help": "Quản trị viên và Người Quản Lý Chung được miễn hạn chế này", + "disable-editing-help": "Quản trị viên và người điều hành chung được miễn hạn chế này", "max-length": "Độ dài tối đa của tin nhắn trò chuyện", "max-chat-room-name-length": "Độ dài tối đa tên phòng trò chuyện", "max-room-size": "Số lượng người dùng tối đa trong phòng trò chuyện", "delay": "Thời gian giữa các tin nhắn trò chuyện (ms)", - "notification-delay": "Độ trễ thông báo cho tin nhắn trò chuyện", + "notification-delay": "Độ trễ thông báo tin nhắn trò chuyện", "notification-delay-help": "Các tin nhắn bổ sung được gửi trong khoảng thời gian này sẽ được đối chiếu và người dùng sẽ được thông báo một lần trong mỗi khoảng thời gian trì hoãn. Đặt giá trị này thành 0 để tắt độ trễ.", "restrictions.seconds-edit-after": "Số giây mà một tin nhắn trò chuyện sẽ vẫn có thể chỉnh sửa được.", "restrictions.seconds-delete-after": "Số giây một tin nhắn trò chuyện sẽ vẫn có thể bị xóa." diff --git a/public/language/vi/admin/settings/email.json b/public/language/vi/admin/settings/email.json index 9c07f52103..11f573f92a 100644 --- a/public/language/vi/admin/settings/email.json +++ b/public/language/vi/admin/settings/email.json @@ -12,7 +12,7 @@ "smtp-transport.enabled": "Bật truyền tải SMTP", "smtp-transport-help": "Bạn có thể chọn từ danh sách các dịch vụ nổi bật hoặc nhập một dịch vụ tùy chỉnh.", "smtp-transport.service": "Chọn một dịch vụ", - "smtp-transport.service-custom": "Tùy chỉnh dịch vụ ", + "smtp-transport.service-custom": "Tùy Chỉnh Dịch Vụ ", "smtp-transport.service-help": "Chọn tên dịch vụ ở trên để sử dụng thông tin đã biết về nó. Ngoài ra, hãy chọn "Dịch vụ tùy chỉnh" và nhập các chi tiết bên dưới.", "smtp-transport.gmail-warning1": "Nếu bạn đang sử dụng GMail làm nhà cung cấp email của mình, bạn sẽ phải tạo "Mật Khẩu Ứng Dụng" để NodeBB xác thực thành công. Bạn có thể tạo một cái tại trang Mật Khẩu Ứng Dụng .", "smtp-transport.gmail-warning2": "Để biết thêm thông tin về giải pháp này, hãy tham khảo bài viết NodeMailer về vấn đề này. Giải pháp thay thế là sử dụng plugin trình gửi email của bên thứ ba như SendGrid, Mailgun, v.v.. Duyệt qua các plugin có sẵn tại đây.", @@ -39,7 +39,7 @@ "subscriptions": "Thông Báo Email", "subscriptions.disable": "Tắt thông báo email", "subscriptions.hour": "Giờ Thông Báo", - "subscriptions.hour-help": "Vui lòng nhập một số đại diện cho giờ để gửi thông báo email đã lên lịch (VD: 0 cho nửa đêm, 17 cho 5h chiều). Hãy nhớ rằng đây là giờ theo chính máy chủ và có thể không khớp chính xác với đồng hồ hệ thống của bạn.
Thời gian máy chủ gần đúng là:
Thông báo hàng ngày kế tiếp được lên lịch để gửi ", + "subscriptions.hour-help": "Vui lòng nhập một số đại diện cho giờ để gửi thông báo email đã lên lịch (VD: 0 cho nửa đêm, 17 cho 5:00 chiều). Hãy nhớ rằng đây là giờ theo chính máy chủ và có thể không khớp chính xác với đồng hồ hệ thống của bạn.
Thời gian máy chủ gần đúng là:
Thông báo hàng ngày kế tiếp được lên lịch để gửi ", "notifications.remove-images": "Xóa hình ảnh khỏi thông báo email", "require-email-address": "Bắt buộc người dùng mới phải điền địa chỉ email", "require-email-address-warning": "Mặc định, người dùng có thể từ chối nhập địa chỉ email bằng cách để trống trường này. Bật tùy chọn này nghĩa là người dùng mới sẽ phải nhập và xác nhận một địa chỉ email để tiến hành đăng ký và tiếp theo truy cập vào diễn đàn. Nó không đảm bảo người dùng sẽ nhập địa chỉ email thực, thậm chí không phải là địa chỉ mà họ sở hữu.", diff --git a/public/language/vi/admin/settings/general.json b/public/language/vi/admin/settings/general.json index 370b10d03d..6ed6f7e2e2 100644 --- a/public/language/vi/admin/settings/general.json +++ b/public/language/vi/admin/settings/general.json @@ -24,7 +24,7 @@ "logo.upload": "Tải lên", "logo.url": "Liên kết URL Logo", "logo.url-placeholder": "URL biểu trưng trang web", - "logo.url-help": "Khi nhấp vào logo, ​​hãy đưa người dùng đến địa chỉ này. Nếu để trống, người dùng sẽ được chuyển đến chỉ mục diễn đàn.
Lưu ý: Đây không phải là URL bên ngoài được sử dụng trong email, v.v. Nó được đặt bởi thuộc tính url trong config.json", + "logo.url-help": "Khi nhấp vào logo, ​​đưa người dùng đến địa chỉ này. Nếu để trống, người dùng sẽ được chuyển đến chỉ mục diễn đàn.
Lưu ý: Đây không phải là URL bên ngoài được sử dụng trong email, v.v. Nó được đặt bởi thuộc tính url trong config.json", "logo.alt-text": "Văn Bản Thay Thế", "log.alt-text-placeholder": "Văn bản thay thế cho khả năng tiếp cận", "favicon": "Biểu tượng ưa thích", @@ -32,21 +32,21 @@ "pwa": "Ứng Dụng Web Tiến Bộ", "touch-icon": "Biểu Tượng Cảm Ứng", "touch-icon.upload": "Tải lên", - "touch-icon.help": "Kích thước và định dạng được đề xuất: 512x512, chỉ định dạng PNG. Nếu không có biểu tượng cảm ứng nào, NodeBB sẽ quay trở lại sử dụng favicon.", - "maskable-icon": "Biểu tượng có thể che được (Màn Trang Chủ)", - "maskable-icon.help": "Kích thước và định dạng nên là: 512x512, chỉ định dạng PNG. Nếu không có biểu tượng có thể che được nào được chỉ định, NodeBB sẽ trở lại Biểu tượng cảm ứng.", + "touch-icon.help": "Kích cỡ và định dạng được đề xuất: 512x512, chỉ định dạng PNG. Nếu không có biểu tượng cảm ứng nào, NodeBB sẽ quay trở lại sử dụng favicon.", + "maskable-icon": "Biểu tượng có thể che được (Màn Hình Trang Chủ)", + "maskable-icon.help": "Kích thước và định dạng nên là: 512x512, chỉ định dạng PNG. Nếu không có biểu tượng có thể che được nào được chỉ định, NodeBB sẽ trở lại Biểu Tượng Chạm.", "outgoing-links": "Liên Kết Đi", "outgoing-links.warning-page": "Sử Dụng Trang Cảnh Báo Liên Kết Đi", "search": "Tìm kiếm", - "search-default-in": "Tìm kiếm trong", - "search-default-in-quick": "Tìm kiếm nhanh trong", - "search-default-sort-by": "Sắp xếp theo", + "search-default-in": "Tìm Trong", + "search-default-in-quick": "Tìm Nhanh Trong", + "search-default-sort-by": "Xếp theo", "outgoing-links.whitelist": "Các tên miền trong danh sách trắng sẽ bỏ qua trang cảnh báo", "site-colors": "Dữ Liệu Mô Tả Màu Trang", "theme-color": "Màu Giao Diện", "background-color": "Màu Nền", "background-color-help": "Màu được sử dụng cho nền màn hình khởi động khi trang web được cài đặt làm PWA", - "undo-timeout": "Hoàn tác thời gian chờ", - "undo-timeout-help": "Một số thao tác như chuyển chủ đề sẽ cho phép người kiểm duyệt hoàn tác hành động của họ trong một khung thời gian nhất định. Đặt thành 0 để tắt hoàn toàn hoàn tác.", + "undo-timeout": "Thời Gian Chờ Hoàn Tác", + "undo-timeout-help": "Một số thao tác như chuyển chủ đề sẽ cho phép mod hoàn tác hành động của họ trong khung giờ nhất định. Đặt thành 0 để tắt hoàn toàn hoàn tác.", "topic-tools": "Công cụ chủ đề" } diff --git a/public/language/vi/admin/settings/group.json b/public/language/vi/admin/settings/group.json index e9a887faaf..b97b763363 100644 --- a/public/language/vi/admin/settings/group.json +++ b/public/language/vi/admin/settings/group.json @@ -4,7 +4,7 @@ "private-groups.help": "Nếu bật, tham gia nhóm cần chủ nhóm chấp nhận (Mặc định: được bật)", "private-groups.warning": "Coi chừng! Nếu tắt tùy chọn này và bạn có nhóm riêng tư, chúng sẽ tự động trở thành công khai.", "allow-multiple-badges": "Cho Phép Nhiều Huy Hiệu", - "allow-multiple-badges-help": "Cờ này có thể được dùng để người dùng chọn nhiều huy hiệu nhóm, yêu cầu hỗ trợ giao diện.", + "allow-multiple-badges-help": "Cờ này có thể được dùng để người dùng chọn nhiều huy hiệu nhóm, yêu cầu giao diện hỗ trợ.", "max-name-length": "Độ Dài Tên Nhóm Tối Đa", "max-title-length": "Độ Dài Tựa Đề Nhóm Tối Đa", "cover-image": "Ảnh Bìa Nhóm", diff --git a/public/language/vi/admin/settings/homepage.json b/public/language/vi/admin/settings/homepage.json index d4a3e81eb4..17426f63d2 100644 --- a/public/language/vi/admin/settings/homepage.json +++ b/public/language/vi/admin/settings/homepage.json @@ -1,8 +1,8 @@ { "home-page": "Trang Chủ", - "description": "Chọn trang hiển thị khi người dùng được chuyển hướng đến URL gốc diễn đàn của bạn.", + "description": "Chọn trang hiển thị khi người dùng chuyển hướng đến URL gốc diễn đàn của bạn.", "home-page-route": "Liên Kết Trang Chủ", "custom-route": "Tùy Chỉnh Liên Kết", "allow-user-home-pages": "Cho Phép Trang Chủ Người Dùng", - "home-page-title": "Tiêu đề của trang chủ (mặc định là \"Trang chủ\")" + "home-page-title": "Tiêu đề trang chủ (mặc định là \"Trang chủ\")" } \ No newline at end of file diff --git a/public/language/vi/admin/settings/languages.json b/public/language/vi/admin/settings/languages.json index dfb1401e51..bca038be61 100644 --- a/public/language/vi/admin/settings/languages.json +++ b/public/language/vi/admin/settings/languages.json @@ -1,6 +1,6 @@ { - "language-settings": "Cài đặt ngôn ngữ", - "description": "Ngôn ngữ mặc định xác định ngôn ngữ cho tất cả người dùng đang truy cập diễn đàn của bạn.
Người dùng cá nhân có thể thay đổi ngôn ngữ ưa thích riêng trong cài đặt tài khoản", - "default-language": "Ngôn ngữ mặc định", - "auto-detect": "Tự động phát hiện cài đặt ngôn ngữ cho khách" + "language-settings": "Cài Đặt Ngôn Ngữ", + "description": "Ngôn ngữ mặc định là cài đặt ngôn ngữ cho tất cả người dùng diễn đàn của bạn.
Người dùng cá nhân có thể thay đổi ngôn ngữ họ thích trong cài đặt tài khoản", + "default-language": "Ngôn Ngữ Mặc Định", + "auto-detect": "Tự Phát Hiện Cài Đặt Ngôn Ngữ Cho Khách" } \ No newline at end of file diff --git a/public/language/vi/admin/settings/navigation.json b/public/language/vi/admin/settings/navigation.json index 054160bc86..5da1a13b02 100644 --- a/public/language/vi/admin/settings/navigation.json +++ b/public/language/vi/admin/settings/navigation.json @@ -10,7 +10,7 @@ "id": "ID: không bắt buộc", "properties": "Thuộc tính:", - "show-to-groups": "Show to Groups:", + "show-to-groups": "Hiển thị cho nhóm:", "open-new-window": "Mở trong một cửa sổ mới", "dropdown": "Thả xuống", "dropdown-placeholder": "Đặt các mục menu thả xuống của bạn bên dưới, tức là:
<li><a class="dropdown-item" href="https://myforum.com">Link 1</a></li>", diff --git a/public/language/vi/admin/settings/post.json b/public/language/vi/admin/settings/post.json index 6c8b908d96..0b8c511f0b 100644 --- a/public/language/vi/admin/settings/post.json +++ b/public/language/vi/admin/settings/post.json @@ -1,20 +1,20 @@ { - "general": "Tổng quan", + "general": "Chung", "sorting": "Sắp Xếp Bài Đăng", "sorting.post-default": "Sắp Xếp Bài Đăng Mặc Định", "sorting.oldest-to-newest": "Cũ nhất đến Mới nhất", "sorting.newest-to-oldest": "Mới nhất đến Cũ nhất", - "sorting.recently-replied": "Recently Replied", - "sorting.recently-created": "Recently Created", + "sorting.recently-replied": "Trả Lời Gần Đây", + "sorting.recently-created": "Đã Tạo Gần Đây", "sorting.most-votes": "Nhiều Bình Chọn", "sorting.most-posts": "Nhiều Bài Đăng", - "sorting.most-views": "Most Views", + "sorting.most-views": "Xem Nhiều Nhất", "sorting.topic-default": "Sắp Xếp Chủ Đề Mặc Định", "length": "Độ Dài Bài Đăng", "post-queue": "Xếp Hàng Bài Đăng", "restrictions": "Hạn Chế Đăng Bài", "restrictions.post-queue": "Bật Xếp Hàng Bài Đăng", - "restrictions.post-queue-rep-threshold": "Danh tiếng cần thiết để vượt qua đợi đăng bài", + "restrictions.post-queue-rep-threshold": "Danh tiếng cần thiết để vượt qua hàng đợi đăng bài", "restrictions.groups-exempt-from-post-queue": "Chọn các nhóm được miễn khỏi đợi đăng bài", "restrictions-new.post-queue": "Bật hạn chế người dùng mới", "restrictions.post-queue-help": "Bật xếp hàng đăng bài sẽ đưa các bài của người dùng mới vào xếp hàng phê duyệt", @@ -27,9 +27,9 @@ "restrictions.post-length": "Độ dài bài đăng", "restrictions.days-until-stale": "Số ngày cho đến khi chủ đề được coi là cũ", "restrictions.stale-help": "Nếu một chủ đề được coi là \"cũ\" thì cảnh báo sẽ được hiển thị cho những người dùng cố gắng trả lời chủ đề đó. (đặt thành 0 để tắt)", - "timestamp": "Dấu thời gian", + "timestamp": "Mốc thời gian", "timestamp.cut-off": "Giới hạn ngày (tính theo ngày)", - "timestamp.cut-off-help": "Ngày tháng & thời gian sẽ được hiển thị một cách tương đối (VD: \"3 giờ trước\" / \"5 ngày trước\"), và bản địa hóa thành nhiều\n\t\t\t\t\tngôn ngữ. Sau một thời điểm nhất định, dòng chữ này có thể được chuyển sang hiển thị ngày được bản địa hóa\n\t\t\t\t\t(VD: 5 Tháng 11, 2016 15:30).
(Mặc định: 30, hoặc một tháng). Đặt là 0 để luôn hiển thị ngày tháng, để trống để luôn hiển thị thời gian tương đối.", + "timestamp.cut-off-help": "Ngày & giờ sẽ được hiển thị tương đối (VD: \"3 giờ trước\" / \"5 ngày trước\"), và địa phương hóa thành nhiều\n\t\t\t\t\tngôn ngữ. Sau một thời gian, dòng chữ này có thể tự chuyển sang hiển thị ngày giờ địa phương\n\t\t\t\t\t(VD: 5 Tháng 11, 2016 15:30).
(Mặc định: 30, hoặc một tháng). Đặt là 0 để luôn hiển thị ngày tháng, để trống để luôn hiển thị thời gian tương đối.", "timestamp.necro-threshold": "Ngưỡng Necro (ngày)", "timestamp.necro-threshold-help": "Một thông báo sẽ được hiển thị giữa các bài đăng nếu thời gian giữa chúng dài hơn ngưỡng yêu cầu. (Mặc định: 7, hoặc một tuần). Đặt thành 0 để tắt.", "timestamp.topic-views-interval": "Khoảng thời gian xem chủ đề tăng dần (phút)", @@ -39,11 +39,11 @@ "teaser.last-reply": "Cuối cùng - Hiển thị câu trả lời mới nhất hoặc trình giữ chỗ \"Không trả lời\" nếu không có câu trả lời", "teaser.first": "Đầu tiên", "showPostPreviewsOnHover": "Hiển thị bản xem trước của các bài đăng khi di chuột qua", - "unread-and-recent": "Unread & Recent Settings", + "unread-and-recent": "Cài Đặt Chưa Đọc & Gần Đây", "unread.cutoff": "Số ngày giới hạn chưa đọc", "unread.min-track-last": "Số bài viết tối thiểu trong chủ đề trước khi theo dõi lần đọc cuối cùng", "recent.max-topics": "Chủ đề tối đa trên trang / gần đây", - "recent.categoryFilter.disable": "Tắt tính năng lọc chủ đề trong chuyên mục bị bỏ qua trên trang /gần đây", + "recent.categoryFilter.disable": "Tắt lọc chủ đề trong danh mục bị bỏ qua trên trang /recent", "signature": "Cài Đặt Chữ Ký", "signature.disable": "Tắt chữ ký", "signature.no-links": "Tắt liên kết trong chữ ký", @@ -60,5 +60,5 @@ "backlinks.help": "Nếu một bài đăng tham chiếu đến chủ đề khác, một liên kết ngược đến bài đăng sẽ được chèn vào chủ đề được tham chiếu vào lúc đó.", "ip-tracking": "Theo dõi IP", "ip-tracking.each-post": "Theo dõi Địa chỉ IP mỗi bài đăng", - "enable-post-history": "Bật Lịch Sử Bài Đăng" + "enable-post-history": "Bật lịch sử đăng bài" } \ No newline at end of file diff --git a/public/language/vi/admin/settings/reputation.json b/public/language/vi/admin/settings/reputation.json index 12b29ddcf7..4914fb3a8b 100644 --- a/public/language/vi/admin/settings/reputation.json +++ b/public/language/vi/admin/settings/reputation.json @@ -2,16 +2,23 @@ "reputation": "Cài Đặt Đánh Giá Uy Tín", "disable": "Tắt Hệ Thống Đánh Giá Uy Tín", "disable-down-voting": "Tắt Phản Đối", - "votes-are-public": "Tất Cả Bình Chọn Là Công Khai", + "upvote-visibility": "Khả năng hiển thị số ủng hộ", + "upvote-visibility-all": "Mọi người có thể xem số ủng hộ", + "upvote-visibility-loggedin": "Chỉ người dùng đã đăng nhập mới có thể xem số ủng hộ", + "upvote-visibility-privileged": "Chỉ những ai có đặc quyền như admin và mod được xem số ủng hộ", + "downvote-visibility": "Khả năng hiển thị số phản đối", + "downvote-visibility-all": "Mọi người có thể xem số phản đối", + "downvote-visibility-loggedin": "Chỉ ai đã đăng nhập được xem số phản đối", + "downvote-visibility-privileged": "Chỉ người dùng đặc quyền như admin hoặc mod có thể xem số phản đối", "thresholds": "Ngưỡng hoạt động", "min-rep-upvote": "Uy tín tối thiểu để ủng hộ bài đăng", - "upvotes-per-day": "Số phiếu ủng hộ mỗi ngày (đặt thành 0 để có số phiếu ủng hộ không giới hạn)", + "upvotes-per-day": "Số phiếu ủng hộ mỗi ngày (đặt là 0 để không giới hạn)", "upvotes-per-user-per-day": "Số phiếu ủng hộ cho mỗi người dùng mỗi ngày (đặt thành 0 để có số phiếu ủng hộ không giới hạn)", "min-rep-downvote": "Uy tín tối thiểu để phản đối bài đăng", "downvotes-per-day": "Số phản đối mỗi ngày (đặt là 0 không giới hạn phản đối)", "downvotes-per-user-per-day": "Số phản đối mỗi người dùng mỗi ngày (đặt là 0 không giới hạn số phản đối)", "min-rep-chat": "Uy tín tối thiểu để gửi tin nhắn trò chuyện", - "min-rep-post-links": "Minimum reputation to post links", + "min-rep-post-links": "Danh tiếng tối thiểu để đăng liên kết", "min-rep-flag": "Uy tín tối thiểu để gắn cờ bài đăng", "min-rep-website": "Uy tín tối thiểu để thêm \"Trang web\" vào hồ sơ người dùng", "min-rep-aboutme": "Uy tín tối thiểu để thêm \"Giới thiệu bản thân\" vào hồ sơ người dùng", @@ -23,12 +30,12 @@ "flags.limit-per-target": "Số lần tối đa nội dung nào đó có thể được gắn cờ", "flags.limit-per-target-placeholder": "Mặc định: 0", "flags.limit-per-target-help": "Khi một bài đăng hoặc người dùng bị gắn cờ nhiều lần, mỗi cờ bổ sung được coi là một "báo cáo" và được thêm vào cờ gốc. Đặt tùy chọn này thành một số khác 0 để giới hạn số lượng báo cáo mà một mục có thể nhận được.", - "flags.limit-post-flags-per-day": "Maximum number of times a user can flag posts in a day", - "flags.limit-post-flags-per-day-help": "Set to 0 to disable, (default: 10)", - "flags.limit-user-flags-per-day": "Maximum number of times a user can flag users in a day", - "flags.limit-user-flags-per-day-help": "Set to 0 to disable, (default: 10)", - "flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts", - "flags.auto-flag-on-downvote-threshold-help": "Set to 0 to disable, (default: 0)", + "flags.limit-post-flags-per-day": "Số lần tối đa người dùng có thể gắn cờ bài đăng trong một ngày", + "flags.limit-post-flags-per-day-help": "Đặt là 0 để tắt, (mặc định: 10)", + "flags.limit-user-flags-per-day": "Số lần tối đa người dùng có thể gắn cờ người dùng trong một ngày", + "flags.limit-user-flags-per-day-help": "Đặt là 0 để tắt, (mặc định: 10)", + "flags.auto-flag-on-downvote-threshold": "Số lượt phản đối đối với bài đăng tự động gắn cờ", + "flags.auto-flag-on-downvote-threshold-help": "Đặt là 0 để tắt, (mặc định: 0)", "flags.auto-resolve-on-ban": "Tự động giải quyết tất cả các yêu cầu của người dùng khi họ bị cấm", "flags.action-on-resolve": "Làm như sau khi một gắn cờ được giải quyết", "flags.action-on-reject": "Làm như sau khi một gắn cờ bị từ chối", diff --git a/public/language/vi/admin/settings/uploads.json b/public/language/vi/admin/settings/uploads.json index deda121e05..7a1b176219 100644 --- a/public/language/vi/admin/settings/uploads.json +++ b/public/language/vi/admin/settings/uploads.json @@ -7,7 +7,7 @@ "orphanExpiryDays": "Ngày lưu giữ các tệp mồ côi", "orphanExpiryDays-help": "Sau nhiều ngày, các tệp tải lên không rõ nguồn gốc sẽ bị xóa khỏi hệ thống tệp.
Đặt 0 hoặc để trống để tắt.", "private-extensions": "Phần mở rộng tệp để đặt ở chế độ riêng tư", - "private-uploads-extensions-help": "Nhập danh sách phần mở rộng tệp tại đây phân tách bằng dấu phẩy để đặt ở chế độ riêng tư (VD: pdf,xls,doc). Để trống có nghĩa là mọi tệp đều riêng tư.", + "private-uploads-extensions-help": "Nhập danh sách phần mở rộng tệp tại đây phân tách bằng dấu phẩy để đặt ở chế độ riêng tư (VD: pdf,xls,doc). Để trống nghĩa là mọi tệp đều riêng tư.", "resize-image-width-threshold": "Chỉnh kích cỡ ảnh nếu chúng rộng hơn chiều rộng đã đặt", "resize-image-width-threshold-help": "(tính bằng pixel, mặc định: 1520 pixel, đặt thành 0 để tắt)", "resize-image-width": "Giảm kích cỡ ảnh xuống đến chiều rộng đã đặt", @@ -20,11 +20,11 @@ "reject-image-width-help": "Hình ảnh rộng hơn giá trị này sẽ bị từ chối.", "reject-image-height": "Chiều Cao Ảnh Tối Đa (pixel)", "reject-image-height-help": "Hình ảnh cao hơn giá trị này sẽ bị từ chối.", - "allow-topic-thumbnails": "Cho phép người dùng tải lên ảnh mô tả chủ đề", - "topic-thumb-size": "Kích Cỡ Ảnh Mô Tả Chủ Đề", + "allow-topic-thumbnails": "Cho phép người dùng tải lên ảnh thumbnails chủ đề", + "topic-thumb-size": "Kích Cỡ Ảnh Thumbnails Chủ Đề", "allowed-file-extensions": "Cho Phép Phần Mở Rộng Tệp", "allowed-file-extensions-help": "Nhập danh sách phần mở rộng tệp phân tách bằng dấu phẩy ở đây (VD: pdf,xls,doc). Để trống là cho phép tất cả.", - "upload-limit-threshold": "‎Giới hạn tốc ‎‎độ tải‎‎ người dùng lên:‎", + "upload-limit-threshold": "‎Giới hạn tỉ lệ tải‎‎ lên người dùng:‎", "upload-limit-threshold-per-minute": "‎Mỗi %1 Phút‎", "upload-limit-threshold-per-minutes": "‎Mỗi %1 Phút‎", "profile-avatars": "Ảnh Đại Diện Hồ Sơ", diff --git a/public/language/vi/admin/settings/user.json b/public/language/vi/admin/settings/user.json index a6c88151fc..ca402454fc 100644 --- a/public/language/vi/admin/settings/user.json +++ b/public/language/vi/admin/settings/user.json @@ -16,7 +16,7 @@ "hide-email": "Ẩn email khỏi người dùng", "show-fullname-as-displayname": "Hiển thị tên đầy đủ của người dùng làm tên hiển thị của họ nếu có", "themes": "Giao diện", - "disable-user-skins": "Ngăn người dùng chọn giao diện tùy chỉnh", + "disable-user-skins": "Ngăn người dùng chọn trang điểm tùy chỉnh", "account-protection": "Bảo Vệ Tài Khoản", "admin-relogin-duration": "Thời lượng đăng nhập lại của quản trị viên (phút)", "admin-relogin-duration-help": "Sau một khoảng thời gian truy cập nhất định vào phần quản trị sẽ yêu cầu đăng nhập lại, hãy đặt thành 0 để tắt", @@ -32,18 +32,18 @@ "session-duration": "Thời lượng phiên nếu \"Ghi nhớ tôi\" không được chọn (giây)", "session-duration-help": "Theo mặc định — hoặc nếu đặt thành 0 — người dùng sẽ duy trì trạng thái đăng nhập trong suốt thời gian của phiên (VD: cửa sổ/tab trình duyệt vẫn mở trong bao lâu). Đặt giá trị này để vô hiệu hóa rõ ràng phiên sau số giây đã chỉ định.", "online-cutoff": "Số phút sau khi người dùng được coi là không hoạt động", - "online-cutoff-help": "Nếu người dùng không thao tác trong khoảng thời gian này, được coi là không hoạt động và không nhận được cập nhật theo thời gian thực.", + "online-cutoff-help": "Nếu người dùng không thao tác trong thời gian này, sẽ coi là không hoạt động và không cập nhật thời gian thực.", "registration": "Đăng Ký Người Dùng", - "registration-type": "Loại Đăng Ký", - "registration-approval-type": "Loại Xét Duyệt Đăng Ký", + "registration-type": "Kiểu Đăng Ký", + "registration-approval-type": "Kiểu Xét Duyệt Đăng Ký", "registration-type.normal": "Bình thường", - "registration-type.admin-approval": "Quản Trị Viên Phê Duyệt", - "registration-type.admin-approval-ip": "Quản Trị Viên Phê Duyệt cho IP", + "registration-type.admin-approval": "Admin Phê Duyệt", + "registration-type.admin-approval-ip": "Amin Duyệt IP", "registration-type.invite-only": "Chỉ Mời", - "registration-type.admin-invite-only": "Chỉ Quản Trị Viên Mời", - "registration-type.disabled": "Không có đăng ký", - "registration-type.help": "Bình thường - Người dùng có thể đăng ký từ trang /register.
\nChỉ mời - Người dùng có thể mời những người khác từ trang người dùng.
\nChỉ Quản Trị Viên mời - Chỉ quản trị viên mới có thể mời người khác từ trang người dùng và admin/manage/users.
\nKhông đăng ký - Không đăng ký người dùng.
", - "registration-approval-type.help": "Bình thường - Người dùng được đăng ký ngay lập tức.
\nPhê duyệt của quản trị viên - Đăng ký người dùng được đặt trong xếp hàng phê duyệt cho quản trị viên.
\nPhê duyệt của quản trị viên cho các IP - Bình thường cho người dùng mới, Phê duyệt quản trị cho các địa chỉ IP đã có tài khoản.
", + "registration-type.admin-invite-only": "Chỉ Admin Mời", + "registration-type.disabled": "Không đăng ký", + "registration-type.help": "Bình Thường - Người dùng có thể đăng ký từ trang /register.
\nChỉ Mời - Người dùng có thể mời những người khác từ trang người dùng.
\nChỉ Admin Mời - Chỉ quản trị viên mới có thể mời người khác từ trang người dùng và admin/manage/users.
\nKhông đăng ký - Không đăng ký người dùng.
", + "registration-approval-type.help": "Bình thường - Người dùng được đăng ký ngay lập tức.
\nAdmin phê duyệt - Đăng ký người dùng được đặt trong hàng phê duyệt cho quản trị viên.
\nAdmin phê duyệt IP - Bình thường cho người mới, Admin phê duyệt IP đã có tài khoản.
", "registration-queue-auto-approve-time": "Thời Gian Xét Duyệt Tự Động", "registration-queue-auto-approve-time-help": "Giờ trước khi người dùng được xét duyệt tự động. 0 để tắt.", "registration-queue-show-average-time": "Hiện thời gian xét duyệt cho người dùng mới biết", @@ -58,7 +58,7 @@ "min-password-strength": "Độ Mạnh Mật Khẩu Tối Thiểu", "max-about-me-length": "Độ Dài Tối Đa Giới Thiệu Bản Thân", "terms-of-use": "Điều Khoản Sử Dụng Diễn Đàn (Để trống để tắt)", - "user-search": "Tìm Kiếm Người Dùng", + "user-search": "Tìm Người Dùng", "user-search-results-per-page": "Số lượng người dùng hiển thị trong kết quả tìm kiếm", "default-user-settings": "Cài Đặt Người Dùng Mặc Định", "show-email": "Hiển thị email", @@ -80,13 +80,13 @@ "default-notification-settings": "Cài đặt thông báo mặc định", "categoryWatchState": "Trạng thái xem chuyên mục mặc định", "categoryWatchState.tracking": "Theo dõi", - "categoryWatchState.notwatching": "Không Xem", + "categoryWatchState.notwatching": "Chưa Xem", "categoryWatchState.ignoring": "Bỏ Qua", - "restrictions-new": "New User Restrictions", - "restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted", - "restrictions.seconds-between-new": "Seconds between posts for new users", - "restrictions.seconds-before-new": "Seconds before a new user can make their first post", - "restrictions.seconds-edit-after-new": "Number of seconds a post remains editable for new users (set to 0 to disable)", - "restrictions.milliseconds-between-messages": "Time between chat messages for new users (ms)", - "restrictions.groups-exempt-from-new-user-restrictions": "Select groups that should be exempt from the new user restrictions" + "restrictions-new": "Hạn chế người dùng mới", + "restrictions.rep-threshold": "Ngưỡng uy tín trước khi những hạn chế này được dỡ bỏ", + "restrictions.seconds-between-new": "Giây giữa các bài viết cho người dùng mới", + "restrictions.seconds-before-new": "Số giây trước khi người dùng mới có thể đăng bài đầu tiên của họ", + "restrictions.seconds-edit-after-new": "Số giây một bài đăng vẫn có thể chỉnh sửa đối với người dùng mới (đặt thành 0 để tắt)", + "restrictions.milliseconds-between-messages": "Thời gian giữa các tin nhắn trò chuyện đối với người dùng mới (ms)", + "restrictions.groups-exempt-from-new-user-restrictions": "Chọn các nhóm sẽ được miễn các hạn chế mới đối với người dùng" } diff --git a/public/language/vi/aria.json b/public/language/vi/aria.json index 6f023dcae0..10e09ded93 100644 --- a/public/language/vi/aria.json +++ b/public/language/vi/aria.json @@ -1,8 +1,8 @@ { - "post-sort-option": "Post sort option, %1", - "topic-sort-option": "Topic sort option, %1", - "user-avatar-for": "User avatar for %1", - "user-watched-tags": "User watched tags", - "delete-upload-button": "Delete upload button", - "group-page-link-for": "Group page link for %1" + "post-sort-option": "Tùy chọn sắp xếp bài đăng, %1", + "topic-sort-option": "Tùy chọn sắp xếp chủ đề, %1", + "user-avatar-for": "Hình đại diện người dùng cho %1", + "user-watched-tags": "Thẻ người dùng đã xem", + "delete-upload-button": "Xóa nút tải lên", + "group-page-link-for": "Liên kết trang nhóm cho %1" } \ No newline at end of file diff --git a/public/language/vi/category.json b/public/language/vi/category.json index 3a7edad00e..8cf9e53d07 100644 --- a/public/language/vi/category.json +++ b/public/language/vi/category.json @@ -3,7 +3,7 @@ "subcategories": "Danh mục phụ", "new-topic-button": "Chủ Đề Mới", "guest-login-post": "Đăng nhập để đăng bài", - "no-topics": "Không có chủ đề nào trong chuyên mục này.
Tại sao bạn không thử đăng?", + "no-topics": "Không chủ đề nào trong danh mục này.
Tại sao bạn không thử đăng?", "browsing": "đang duyệt", "no-replies": "Không ai trả lời", "no-new-posts": "Không có bài mới.", @@ -11,9 +11,9 @@ "ignore": "Bỏ qua", "watching": "Đang xem", "tracking": "Theo dõi", - "not-watching": "Không xem", + "not-watching": "Chưa Xem", "ignoring": "Bỏ qua", - "watching.description": "Thông báo tôi về chủ đề mới.
Hiển thị chủ đề chưa đọc và gần đây", + "watching.description": "Thông báo tôi chủ đề mới.
Hiển thị chủ đề chưa đọc và gần đây", "tracking.description": "Hiển thị chủ đề chưa đọc và gần đây", "not-watching.description": "Không hiển thị chủ đề trong chưa đọc, hiển thị gần đây", "ignoring.description": "Không hiển thị chủ đề chưa đọc và gần đây", @@ -21,6 +21,6 @@ "tracking.message": "Bạn hiện đang theo dõi thông tin cập nhật từ danh mục này và tất cả các danh mục phụ", "notwatching.message": "Bạn không xem cập nhật từ danh mục này và tất cả các danh mục phụ", "ignoring.message": "Bây giờ bạn đang bỏ qua các cập nhật từ danh mục này và tất cả các danh mục phụ", - "watched-categories": "Chuyên mục đã xem", + "watched-categories": "Danh mục đã xem", "x-more-categories": "%1 chuyên mục khác" } \ No newline at end of file diff --git a/public/language/vi/email.json b/public/language/vi/email.json index 8155cec7c8..dc1f7724bf 100644 --- a/public/language/vi/email.json +++ b/public/language/vi/email.json @@ -3,15 +3,15 @@ "password-reset-requested": "Yêu cầu đặt lại mật khẩu!", "welcome-to": "Chào mừng đến với %1", "invite": "Lời mời từ %1", - "greeting-no-name": "Xin chào", - "greeting-with-name": "Xin chào %1", + "greeting-no-name": "Chào", + "greeting-with-name": "Chào %1", "email.verify-your-email.subject": "Vui lòng xác thực tài khoản của bạn", "email.verify.text1": "Bạn đã yêu cầu chúng tôi thay đổi hoặc xác nhận địa chỉ email của bạn", "email.verify.text2": "Vì lý do bảo mật, chúng tôi chỉ thay đổi hoặc xác nhận địa chỉ email trong hồ sơ khi quyền sở hữu của nó đã được xác nhận qua email. Nếu bạn không yêu cầu điều này, bạn không cần thực hiện hành động nào.", "email.verify.text3": "Sau khi bạn xác nhận địa chỉ email này, chúng tôi sẽ đổi email hiện tại của bạn bằng địa chỉ này (%1).", "welcome.text1": "Cảm ơn bạn đã đăng ký tại %1!", "welcome.text2": "Để kích hoạt đầy đủ tính năng của tài khoản, chúng tôi cần xác nhận địa chỉ email mà bạn đã đăng ký.", - "welcome.text3": "Quản trị viên đã chấp nhận đơn đăng ký của bạn. Bạn có thể đăng nhập với tên đăng nhập/mật khẩu ngay bây giờ.", + "welcome.text3": "Admin đã chấp nhận đơn đăng ký của bạn. Bạn có thể đăng nhập với tên đăng nhập/mật khẩu ngay bây giờ.", "welcome.cta": "Nhấn vào đây để xác nhận địa chỉ email", "invitation.text1": "%1 đã mời bạn tham gia %2", "invitation.text2": "Lời mời của bạn sẽ hết hạn sau %1 ngày.", @@ -20,10 +20,10 @@ "reset.text2": "Để đặt lại mật khẩu, hãy bấm vào liên kết sau:", "reset.cta": "Nhấn vào đây để đặt lại mật khẩu của bạn", "reset.notify.subject": "Thay đổi mật khẩu thành công", - "reset.notify.text1": "Chúng tôi thông báo cho bạn rằng vào ngày %1, mật khẩu của bạn được thay đổi thành công.", + "reset.notify.text1": "Chúng tôi thông báo cho bạn rằng vào ngày %1, bạn đã đổi mật khẩu thành công.", "reset.notify.text2": "Nếu bạn không cho phép điều này, hãy thông báo ngay cho quản trị viên.", - "digest.unread-rooms": "Unread rooms", - "digest.room-name-unreadcount": "%1 (%2 unread)", + "digest.unread-rooms": "Phòng chưa đọc", + "digest.room-name-unreadcount": "%1 (%2 chưa đọc)", "digest.latest-topics": "Chủ đề mới nhất từ %1", "digest.top-topics": "Chủ đề hàng đầu từ %1", "digest.popular-topics": "Các chủ đề phổ biến từ %1", @@ -36,8 +36,8 @@ "digest.title.day": "Thông Báo Hàng Ngày Của Bạn", "digest.title.week": "Thông Báo Hàng Tuần Của Bạn", "digest.title.month": "Thông Báo Hàng Tháng Của Bạn", - "notif.chat.new-message-from-user": "New message from \"%1\"", - "notif.chat.new-message-from-user-in-room": "New message from %1 in room %2", + "notif.chat.new-message-from-user": "Tin nhắn mới từ \"%1\"", + "notif.chat.new-message-from-user-in-room": "Tin nhắn mới từ %1 trong phòng %2", "notif.chat.cta": "Nhấn vào đây để tiếp tục cuộc hội thoại", "notif.chat.unsub.info": "Thông báo trò chuyện này đã được gửi cho bạn dựa theo cài đặt đăng ký của bạn.", "notif.post.unsub.info": "Thông báo bài viết này được gửi cho bạn dựa tên thiết lập nhận thông báo của bạn", @@ -45,8 +45,8 @@ "notif.cta": "Đến diễn đàn", "notif.cta-new-reply": "Xem Bài Viết", "notif.cta-new-chat": "Xem Trò Chuyện", - "notif.test.short": "Kiểm Tra Thông Báo", - "notif.test.long": "Đây là một kiểm tra email thông báo. Gửi giúp đỡ!", + "notif.test.short": "Thông Báo Kiểm Tra", + "notif.test.long": "Đây là một kiểm tra thông báo email. Gửi giúp đỡ!", "test.text1": "Đây là email thử nghiệm để kiểm tra trình gửi email NodeBB của bạn đã cài đặt đúng.", "unsub.cta": "Nhấp vào đây để thay đổi các cài đặt đó", "unsubscribe": "hủy đăng ký", @@ -57,5 +57,5 @@ "banned.text1": "Người dùng %1 đã bị cấm khỏi %2", "banned.text2": "Lệnh cấm sẽ kéo dài đến %1.", "banned.text3": "Đây là lý do tại sao bạn bị cấm:", - "closing": "Xin cảm ơn!" + "closing": "Cảm ơn!" } \ No newline at end of file diff --git a/public/language/vi/error.json b/public/language/vi/error.json index 3ae8af4e2b..3fce884276 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -30,9 +30,9 @@ "csrf-invalid": "Chúng tôi không thể đăng nhập cho bạn, có thể do một phiên đã hết hạn. Vui lòng thử lại", "invalid-path": "Đường dẫn không hợp lệ", "folder-exists": "Thư mục tồn tại", - "invalid-pagination-value": "Giá trị phân trang không hợp lệ, tối thiểu phải là %1 và tối đa là %2", + "invalid-pagination-value": "Giá trị phân trang không hợp lệ, tối thiểu là %1 và tối đa là %2", "username-taken": "Tên đăng nhập đã tồn tại", - "email-taken": "Email address is already taken.", + "email-taken": "Địa chỉ email đã được sử dụng.", "email-nochange": "Email đã nhập giống với email đã có trong tệp.", "email-invited": "Email đã được mời", "email-not-confirmed": "Đăng trong một số danh mục hoặc chủ đề được bật sau khi email của bạn được xác nhận, vui lòng nhấp vào đây để gửi email xác nhận.", @@ -42,7 +42,7 @@ "user-doesnt-have-email": "Người dùng \"%1\" chưa đặt email.", "email-confirm-failed": "Chúng tôi không thể xác nhận email của bạn, vui lòng thử lại sau.", "confirm-email-already-sent": "Email xác nhận đã được gửi, vui lòng đợi %1 phút để gửi email khác.", - "confirm-email-expired": "Confirmation email expired", + "confirm-email-expired": "Email xác nhận đã hết hạn", "sendmail-not-found": "Không thể tìm thấy tệp thực thi sendmail, vui lòng đảm bảo rằng nó được cài đặt và thực thi bởi người dùng chạy NodeBB.", "digest-not-enabled": "Người dùng này chưa bật thông báo hoặc mặc định hệ thống không được cấu hình để gửi thông báo", "username-too-short": "Tên đăng nhập quá ngắn", @@ -91,17 +91,17 @@ "category-not-selected": "Danh mục không được chọn.", "too-many-posts": "Bạn chỉ có đăng bài mới mỗi %1 giây - vui lòng đợi để tiếp tục đăng bài.", "too-many-posts-newbie": "Là người dùng mới, bạn chỉ có thể đăng %1 giây một lần cho đến khi bạn đạt được %2 danh tiếng - vui lòng đợi trước khi đăng lại", - "too-many-posts-newbie-minutes": "Là người dùng mới, bạn chỉ có thể đăng bài %1 phút một lần cho đến khi bạn đạt được %2 danh tiếng - vui lòng đợi trước khi đăng lại", - "already-posting": "You are already posting", + "too-many-posts-newbie-minutes": "Là người dùng mới, bạn chỉ được đăng bài %1 phút một lần cho đến khi bạn đạt được %2 danh tiếng - vui lòng đợi trước khi đăng lại", + "already-posting": "Bạn đã đăng rồi", "tag-too-short": "Vui lòng nhập tag dài hơn. Tag phải có tối thiểu %1 ký tự.", "tag-too-long": "Vui lòng nhập tag ngắn hơn. Tag chỉ có thể có tối đa %1 ký tự.", - "tag-not-allowed": "Thẻ không được phép", + "tag-not-allowed": "Thẻ không cho phép", "not-enough-tags": "Không đủ thẻ. Chủ đề phải có ít nhất %1 thẻ.", "too-many-tags": "Quá nhiều thẻ. Chủ đề không thể nhiều hơn %1 thẻ.", "cant-use-system-tag": "Bạn không thể dùng thẻ hệ thống này.", "cant-remove-system-tag": "Bạn không thể xóa thẻ hệ thống này.", "still-uploading": "Vui lòng đợi quá trình tải lên hoàn tất.", - "file-too-big": "Kích thước tệp cho phép tối đa là %1 kB - vui lòng tải lên một tệp nhỏ hơn", + "file-too-big": "Kích thước tối đa là %1 kB - vui lòng tải lên một tệp nhỏ hơn", "guest-upload-disabled": "Tải lên của khách đã bị tắt", "cors-error": "Không thể tải lên hình ảnh do CORS bị cấu hình sai", "upload-ratelimit-reached": "‎Bạn‎‎ đã tải lên quá nhiều tệp cùng một lúc. Vui lòng thử lại sau.‎", @@ -136,7 +136,7 @@ "group-not-member": "Không phải thành viên nhóm này.", "group-needs-owner": "Yêu cầu phải có ít nhất một chủ nhóm", "group-already-invited": "Thành viên này đã được mời", - "group-already-requested": "Yêu cầu tham gia của bạn đã được gửi.", + "group-already-requested": "Yêu cầu tham gia thành viên của bạn đã được gửi.", "group-join-disabled": "Bạn không thể tham gia nhóm này vào lúc này", "group-leave-disabled": "Bạn không thể rời khỏi nhóm này vào lúc này", "group-user-not-pending": "Người dùng không có yêu cầu đang chờ xử lý để tham gia nhóm này.", @@ -153,6 +153,7 @@ "about-me-too-long": "Xin lỗi, giới thiệu bản thân bạn không thể dài hơn %1 ký tự.", "cant-chat-with-yourself": "Bạn không thể trò chuyện với chính bạn!", "chat-restricted": "Người dùng này đã hạn chế tin nhắn trò chuyện của họ. Họ phải theo dõi bạn trước khi bạn có thể trò chuyện với họ", + "chat-user-blocked": "Bạn đã bị chặn bởi người dùng này.", "chat-disabled": "Hệ thống trò chuyện bị tắt", "too-many-messages": "Bạn đã gửi quá nhiều tin nhắn, vui lòng đợi trong giây lát.", "invalid-chat-message": "Tin nhắn trò chuyện không hợp lệ", @@ -168,12 +169,12 @@ "cant-remove-users-from-chat-room": "Không thể xóa người dùng khỏi phòng trò chuyện.", "chat-room-name-too-long": "Tên phòng trò chuyện quá dài. Tên không được dài hơn %1 ký tự.", "already-voting-for-this-post": "Bạn đã bỏ phiếu cho bài viết này", - "reputation-system-disabled": "Hệ thống đánh giá uy tính đã bị vô hiệu hóa.", + "reputation-system-disabled": "Hệ thống đánh giá uy tính đã tắt.", "downvoting-disabled": "Phản đối đã bị tắt", "not-enough-reputation-to-chat": "Bạn cần %1 uy tín để trò chuyện", "not-enough-reputation-to-upvote": "Bạn cần %1 uy tín để ủng hộ", "not-enough-reputation-to-downvote": "Bạn cần %1 uy tín để phản đối", - "not-enough-reputation-to-post-links": "You need %1 reputation to post links", + "not-enough-reputation-to-post-links": "Bạn cần %1 uy tín để đăng liên kết", "not-enough-reputation-to-flag": "Bạn cần %1 uy tín để gắn cờ bài đăng này", "not-enough-reputation-min-rep-website": "Bạn cần %1 uy tín để thêm một trang web", "not-enough-reputation-min-rep-aboutme": "Bạn cần %1 uy tín để thêm thông tin bản thân", @@ -184,15 +185,15 @@ "user-already-flagged": "Bạn đã gắn cờ người dùng này", "post-flagged-too-many-times": "Bài đăng này đã bị người khác gắn cờ", "user-flagged-too-many-times": "Người dùng này đã bị người khác gắn cờ", - "too-many-post-flags-per-day": "You can only flag %1 post(s) per day", - "too-many-user-flags-per-day": "You can only flag %1 user(s) per day", - "cant-flag-privileged": "Bạn không có quyền gắn cờ hồ sơ hay nội dung của người dùng đặc biệt (người kiểm duyệt/người quản lý chung/quản trị viên)", + "too-many-post-flags-per-day": "Bạn chỉ được gắn cờ %1 bài đăng mỗi ngày", + "too-many-user-flags-per-day": "Bạn chỉ được gắn cờ %1 người dùng mỗi ngày", + "cant-flag-privileged": "Bạn không có quyền gắn cờ hồ sơ hay nội dung của người dùng đặc quyền (mod/người điều hành chung/admin)", "cant-locate-flag-report": "Không thể định vị báo cáo cờ", "self-vote": "Bạn không thể tự bầu cho bài đăng của mình", "too-many-upvotes-today": "Bạn chỉ có thể ủng hộ %1 lần một ngày", - "too-many-upvotes-today-user": "Bạn chỉ có thể ủng hộ người dùng %1 lần một ngày", + "too-many-upvotes-today-user": "Bạn chỉ được ủng hộ người dùng %1 lần một ngày", "too-many-downvotes-today": "Bạn chỉ có thể phản đối %1 lần một ngày", - "too-many-downvotes-today-user": "Bạn chỉ có thể phản đối người dùng %1 lần một ngày", + "too-many-downvotes-today-user": "Bạn chỉ được phản đối người dùng %1 lần một ngày", "reload-failed": "NodeBB gặp lỗi trong khi tải lại: \"%1\". NodeBB sẽ tiếp tục hoạt động với dữ liệu trước đó, tuy nhiên bạn nên tháo gỡ những gì bạn vừa thực hiện trước khi tải lại.", "registration-error": "Lỗi Đăng Ký", "parse-error": "Đã xảy ra lỗi khi phân tích phản hồi của máy chủ", @@ -213,18 +214,18 @@ "session-mismatch-text": "Có vẻ như phiên đăng nhập của bạn không còn khớp với máy chủ. Vui lòng làm mới trang này.", "no-topics-selected": "Không có chủ đề nào đang được chọn!", "cant-move-to-same-topic": "Bạn không thể di chuyển bài viết vào cùng chủ đề hiện tại!", - "cant-move-topic-to-same-category": "Không thể di chuyển chủ đề sang cùng chuyên mục!", - "cannot-block-self": "Bạn không thể tự khóa tài khoản của bạn!", - "cannot-block-privileged": "Bạn không thể khóa quản trị viên hay người quản lý chung.", + "cant-move-topic-to-same-category": "Không thể di chuyển chủ đề đến cùng danh mục!", + "cannot-block-self": "Bạn không thể tự khóa bạn!", + "cannot-block-privileged": "Bạn không thể admin hay người điều hành chung.", "cannot-block-guest": "Khách không thể chặn người dùng khác", "already-blocked": "Người dùng này đã bị chặn", "already-unblocked": "Người dùng này đã được bỏ chặn", "no-connection": "Kết nối internet của bạn có vấn đề.", "socket-reconnect-failed": "Không thể truy cập máy chủ vào lúc này. Nhấp vào đây để thử lại hoặc thử lại sau", - "invalid-plugin-id": "Invalid plugin ID", - "plugin-not-whitelisted": "Không thể cài đặt plugin – chỉ những plugin được Trình quản lý gói NodeBB đưa vào danh sách trắng mới có thể được cài đặt qua ACP", + "invalid-plugin-id": "ID plugin không hợp lệ", + "plugin-not-whitelisted": "Không thể cài đặt plugin – chỉ có plugin được Quản Lý Gói NodeBB đưa vào danh sách trắng mới có thể được cài đặt qua ACP", "plugins-set-in-configuration": "Bạn không được phép thay đổi trạng thái plugin vì chúng được xác định trong thời gian chạy (config.json, biến môi trường hoặc đối số đầu cuối), thay vào đó hãy sửa đổi cấu hình.", - "theme-not-set-in-configuration": "Khi xác định các plugin hoạt động trong cấu hình, việc thay đổi chủ đề yêu cầu thêm chủ đề mới vào danh sách các plugin hoạt động trước khi cập nhật nó trong ACP", + "theme-not-set-in-configuration": "Khi xác định các plugin hoạt động trong cấu hình, thay đổi giao diện buộc phải thêm giao diện mới vào danh sách các plugin hoạt động trước khi cập nhật nó trong ACP", "topic-event-unrecognized": "Sự kiện chủ đề '%1' không được công nhận", "cant-set-child-as-parent": "Không thể đặt con làm chuyên mục chính", "cant-set-self-as-parent": "Không thể tự đặt mình là chuyên mục chính", diff --git a/public/language/vi/flags.json b/public/language/vi/flags.json index 9ab84ccb33..139d0bf25f 100644 --- a/public/language/vi/flags.json +++ b/public/language/vi/flags.json @@ -4,35 +4,35 @@ "reports": "Báo cáo", "first-reported": "Được báo cáo đầu tiên", "no-flags": "Hoan hô! Không tìm thấy cờ.", - "x-flags-found": "%1 flag(s) found.", - "assignee": "Người được ủy nhiệm", + "x-flags-found": "%1 cờ tìm thấy.", + "assignee": "Ủy nhiệm", "update": "Cập nhật", "updated": "Đã cập nhật", "resolved": "Đã Xử Lý", "report-added": "Đã thêm", "report-rescinded": "Đã hủy bỏ", "target-purged": "Nội dung mà cờ này đề cập đến đã bị xóa và không còn nữa.", - "target-aboutme-empty": "Người dùng này không có "Giới Thiệu Về Tôi" set.", + "target-aboutme-empty": "Người dùng này không có "Giới Thiệu Bản Thân".", "graph-label": "Cờ Hàng Ngày", "quick-filters": "Bộ Lọc Nhanh", "filter-active": "Có một hoặc nhiều bộ lọc đang hoạt động trong danh sách cờ này", "filter-reset": "Xóa Bộ Lọc", "filters": "Tùy Chọn Bộ Lọc", - "filter-reporterId": "Phóng viên", - "filter-targetUid": "Reportee", + "filter-reporterId": "Báo cáo viên", + "filter-targetUid": "Người cáo cáo", "filter-type": "Loại Cờ", "filter-type-all": "Tất Cả Nội Dung", "filter-type-post": "Bài viết", "filter-type-user": "Người dùng", "filter-state": "Trạng thái", - "filter-assignee": "Assignee", + "filter-assignee": "Ủy nhiệm", "filter-cid": "Chuyên mục", "filter-quick-mine": "Được giao cho tôi", "filter-cid-all": "Tất cả chuyên mục", "apply-filters": "Áp Dụng Bộ Lọc", - "more-filters": "Thêm Nhiều Bộ Lọc", - "fewer-filters": "Ít bộ lọc hơn", + "more-filters": "Thêm Bộ Lọc", + "fewer-filters": "Bớt Bộ Lọc", "quick-actions": "Hành Động Nhanh", "flagged-user": "Người Dùng Bị Gắn Cờ", @@ -79,7 +79,7 @@ "sort-replies": "Nhiều lượt trả lời", "modal-title": "Báo Cáo Nội Dung", - "modal-body": "Vui lòng nêu rõ lý do bạn gắn cờ %1 %2 để xem xét. Ngoài ra, hãy sử dụng một trong các nút báo cáo nhanh nếu có.", + "modal-body": "Vui lòng nêu rõ lý do bạn gắn cờ %1 %2 để đánh giá. Ngoài ra, hãy sử dụng một trong các nút báo cáo nhanh nếu có.", "modal-reason-spam": "Quấy Rối", "modal-reason-offensive": "Phản Cảm", "modal-reason-other": "Khác (Ghi Rõ Bên Dưới)", @@ -90,6 +90,6 @@ "bulk-actions": "‎Hành động hàng loạt‎", "bulk-resolve": "Xử Lý Cờ", "bulk-success": "%1 cờ đã cập nhật", - "flagged-timeago": "Flagged ", - "auto-flagged": "[Tự động được gắn cờ] Đã nhận được %1 phiếu phản đối." + "flagged-timeago": "Đã gắn cờ ", + "auto-flagged": "[Cờ Tự Động] Nhận được %1 phản đối." } \ No newline at end of file diff --git a/public/language/vi/global.json b/public/language/vi/global.json index 70be75c94f..53ff511ca8 100644 --- a/public/language/vi/global.json +++ b/public/language/vi/global.json @@ -15,7 +15,7 @@ "login": "Đăng nhập", "please-log-in": "Vui Lòng Đăng Nhập", "logout": "Đăng xuất", - "posting-restriction-info": "Chỉ thành viên chính thức mới được phép đăng bài, nhấn vào đây để đăng nhập.", + "posting-restriction-info": "Chỉ thành viên chính thức được đăng bài, bấm vào đây để đăng nhập.", "welcome-back": "Chào Mừng Trở Lại", "you-have-successfully-logged-in": "Bạn đã đăng nhập thành công", "save-changes": "Lưu thay đổi", @@ -24,15 +24,15 @@ "cancel": "Hủy bỏ", "close": "Đóng", "pagination": "Phân trang", - "pagination.previouspage": "Previous Page", - "pagination.nextpage": "Next Page", - "pagination.firstpage": "First Page", - "pagination.lastpage": "Last Page", + "pagination.previouspage": "Trang Trước", + "pagination.nextpage": "Trang Kế", + "pagination.firstpage": "Trang Đầu", + "pagination.lastpage": "Trang Cuối", "pagination.out-of": "%1 trong số %2", "pagination.enter-index": "Đi đến chỉ mục bài đăng", - "pagination.go-to-page": "Go to page", - "pagination.page-x": "Page %1", - "header.brand-logo": "Brand Logo", + "pagination.go-to-page": "Tới trang", + "pagination.page-x": "Trang %1", + "header.brand-logo": "Logo Thương Hiệu", "header.admin": "Quản trị viên", "header.categories": "Chuyên mục", "header.recent": "Gần đây", @@ -76,7 +76,7 @@ "x-votes": "%1 bình chọn", "voters": "Người Bình Chọn", "upvoters": "Người Ủng Hộ", - "upvoted": "Đã Ủng Hộ", + "upvoted": "Đã ủng hộ", "downvoters": "Người phản đối", "downvoted": "Đã phản đối", "views": "Lượt xem", @@ -84,7 +84,7 @@ "reputation": "Uy tín", "lastpost": "Bài viết cuối cùng", "firstpost": "Bài viết đầu tiên", - "about": "About", + "about": "Thông tin", "read-more": "Đọc thêm", "more": "Xem thêm", "none": "Trống", @@ -103,7 +103,7 @@ "norecenttopics": "Không có chủ đề gần đây", "recentposts": "Bài Viết Gần Đây", "recentips": "Các IP đã Đăng nhập Gần đây", - "moderator-tools": "Công cụ quản lí", + "moderator-tools": "Công Cụ Điều Hành", "status": "Trạng thái", "online": "Trực tuyến", "away": "Vắng mặt", @@ -140,12 +140,12 @@ "edited": "Đã Sửa", "disabled": "Đã tắt", "select": "Chọn", - "selected": "Selected", + "selected": "Đã chọn", "copied": "Đã sao chép", "user-search-prompt": "Nhập để tìm kiếm thành viên", "hidden": "Ẩn", - "sort": "Sort", + "sort": "Xếp", "actions": "Hành Động", - "rss-feed": "RSS Feed", - "skip-to-content": "Skip to content" + "rss-feed": "Nguồn RSS", + "skip-to-content": "Bỏ qua nội dung" } \ No newline at end of file diff --git a/public/language/vi/groups.json b/public/language/vi/groups.json index cbd704ca1b..0ec0e5d500 100644 --- a/public/language/vi/groups.json +++ b/public/language/vi/groups.json @@ -1,7 +1,7 @@ { "all-groups": "Tất cả các nhóm", "groups": "Nhóm", - "members": "Members", + "members": "Thành Viên", "view-group": "Xem nhóm", "owner": "Người Sở Hữu Nhóm", "new-group": "Tạo nhóm mới", @@ -21,8 +21,8 @@ "cover-saving": "Đang lưu", "details.title": "Chi Tiết Nhóm", "details.members": "Danh Sách Thành Viên", - "details.pending": "Thành viên đang chờ trả lời", - "details.invited": "Thành viên đã được mời", + "details.pending": "Thành Viên Đang Chờ", + "details.invited": "Thành Viên Đã Mời", "details.has-no-posts": "Thành viên nhóm này chưa đăng bài viết nào.", "details.latest-posts": "Bài viết mới nhất", "details.private": "Riêng tư", @@ -35,7 +35,7 @@ "details.owner-options": "Quản Trị Nhóm", "details.group-name": "Tên nhóm", "details.member-count": "Số thành viên", - "details.creation-date": "Ngày Thành Lập", + "details.creation-date": "Ngày Tạo", "details.description": "Miêu tả", "details.member-post-cids": "ID chuyên mục để hiển thị bài đăng từ", "details.badge-preview": "Xem thử huy hiệu", @@ -60,7 +60,7 @@ "membership.reject": "Từ chối", "new-group.group-name": "Tên Nhóm:", "upload-group-cover": "Tải lên ảnh bìa nhóm", - "bulk-invite-instructions": "Nhập danh sách username, ngăn cách bằng dấu phẩy, để mời vào nhóm", + "bulk-invite-instructions": "Nhập danh sách tên đăng nhập, phân tách bằng dấu phẩy, để mời vào nhóm", "bulk-invite": "Mời nhiều người", "remove-group-cover-confirm": "Bạn có chắc rằng muốn xoá ảnh bìa không?" } \ No newline at end of file diff --git a/public/language/vi/modules.json b/public/language/vi/modules.json index df9c0dfb86..f9968b28c3 100644 --- a/public/language/vi/modules.json +++ b/public/language/vi/modules.json @@ -1,12 +1,13 @@ { - "chat.room-id": "Room %1", + "chat.room-id": "Phòng %1", "chat.chatting-with": "Trò chuyện với", - "chat.placeholder": "Nhập tin nhắn trò chuyện tại đây, kéo và thả hình ảnh, nhấn enter để gửi", - "chat.placeholder.mobile": "Nhập tin nhắn trò chuyện tại đây", - "chat.scroll-up-alert": "Go to most recent message", - "chat.usernames-and-x-others": "%1 & %2 others", + "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", - "chat.chat-with-usernames-and-x-others": "Chat with %1 & %2 others", + "chat.chat-with-usernames-and-x-others": "Trò chuyện với %1 & %2 khác", "chat.send": "Gửi", "chat.no-active": "Bạn không có cuộc trò chuyện đang hoạt động nào.", "chat.user-typing-1": "%1 đang viết ...", @@ -48,13 +49,13 @@ "chat.notification-settings": "Cài Đặt Thông Báo", "chat.default-notification-setting": "Cài Đặt Thông Báo Mặc Định", "chat.notification-setting-room-default": "Phòng Mặc Định", - "chat.notification-setting-none": "Không có thông báo", - "chat.notification-setting-at-mention-only": "@mention only", + "chat.notification-setting-none": "Không thông báo", + "chat.notification-setting-at-mention-only": "Chỉ khi @đề cập", "chat.notification-setting-all-messages": "Tất cả các tin nhắn", "chat.select-groups": "Chọn Nhóm", - "chat.add-user-help": "Tìm người dùng ở đây. Người dùng được chọn sẽ được thêm vào trò chuyện. Người dùng mới sẽ không thấy tin nhắn trò chuyện được đăng trước khi họ được thêm vào. Chỉ chủ phòng () được xóa người dùng khỏi phòng trò chuyện.", + "chat.add-user-help": "Tìm người dùng ở đây. Người dùng được chọn sẽ được thêm vào trò chuyện. Người dùng mới vào sẽ không thấy tin nhắn trò chuyện được đăng trước khi họ được thêm vào. Chỉ chủ phòng () được xóa người dùng khỏi phòng trò chuyện.", "chat.confirm-chat-with-dnd-user": "Người dùng này đã đặt trạng thái của họ thành DnD (Không làm phiền). Bạn vẫn muốn trò chuyện với họ?", - "chat.room-name-optional": "Room Name (Optional)", + "chat.room-name-optional": "Tên Phòng (Tùy Chọn)", "chat.rename-room": "Đổi Tên Phòng", "chat.rename-placeholder": "Nhập tên phòng của bạn ở đây", "chat.rename-help": "Đẳt tên phòng ở đây, tất cả những người tham gia phòng này có thể xem.", @@ -68,16 +69,16 @@ "chat.in-room": "Trong phòng này", "chat.kick": "Loại ra", "chat.show-ip": "Hiện IP", - "chat.copy-text": "Copy Text", - "chat.copy-link": "Copy Link", + "chat.copy-text": "Sao Chép Văn Bản", + "chat.copy-link": "Sao Chép Liên Kết", "chat.owner": "Chủ Phòng", "chat.grant-rescind-ownership": "Cấp/Hủy bỏ Quyền sở hữu", "chat.system.user-join": "%1 đã tham gia phòng ", - "chat.system.user-leave": "%1 đã rời phòng ", - "chat.system.room-rename": "%2 đã đổi tên phòng sang \"%1\" ", + "chat.system.user-leave": "%1 đã rời khỏi phòng ", + "chat.system.room-rename": "%2 đã đổi tên phòng thành \"%1\" ", "composer.compose": "Soạn thảo", - "composer.show-preview": "Hiện Xem trước", - "composer.hide-preview": "Ẩn Xem trước", + "composer.show-preview": "Hiện Xem Thử", + "composer.hide-preview": "Ẩn Xem Thử", "composer.help": "Trợ giúp", "composer.user-said-in": "%1 đã nói trong %2:", "composer.user-said": "%1 đã nói:", diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json index b60e410d8b..e6fb117748 100644 --- a/public/language/vi/notifications.json +++ b/public/language/vi/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 và %3 người khác đã đăng trả lời đến: %4", "user-posted-topic": "%1 đã đăng một chủ đề mới: %2", "user-edited-post": "%1 đã chỉnh sửa một bài đăng trong %2", - "user-posted-topic-with-tag": "%1 đã đăng một chủ đề mới với thẻ %2", - "user-posted-topic-with-tag-dual": "%1 đã đăng một chủ đề mới với thẻ %2 và %3", - "user-posted-topic-with-tag-triple": "%1 đã đăng một chủ đề mới với thẻ %2, %3 và %4", - "user-posted-topic-with-tag-multiple": "%1 đã đăng một chủ đề mới với thẻ %2", + "user-posted-topic-with-tag": "%1 đã đăng %2 (đã gắn thẻ %3)", + "user-posted-topic-with-tag-dual": "%1 đã đăng %2 (gắn thẻ %3 và %4)", + "user-posted-topic-with-tag-triple": "%1 đã đăng %2 (gắn thẻ %3, %4, và %5)", + "user-posted-topic-with-tag-multiple": "%1 đã đăng %2 (gắn thẻ %3)", "user-posted-topic-in-category": "%1 đã đăng chủ đề mới trong %2", "user-started-following-you": "%1 đã theo dõi bạn.", "user-started-following-you-dual": "%1 và %2 đã bắt đầu theo dõi bạn.", @@ -75,6 +75,7 @@ "email-confirmed": "Đã Xác Nhận Email", "email-confirmed-message": "Cảm ơn bạn đã xác nhận địa chỉ email của bạn. Tài khoản của bạn đã được kích hoạt đầy đủ.", "email-confirm-error-message": "Đã có lỗi khi xác nhận địa chỉ email. Có thể đoạn mã không đúng hoặc đã hết hạn.", + "email-confirm-error-message-already-validated": "Địa chỉ email của bạn đã được xác thực.", "email-confirm-sent": "Đã gửi email xác nhận.", "none": "Trống", "notification-only": "Chỉ Thông Báo", diff --git a/public/language/vi/pages.json b/public/language/vi/pages.json index ce064852f2..671b600111 100644 --- a/public/language/vi/pages.json +++ b/public/language/vi/pages.json @@ -17,10 +17,10 @@ "registration-queue": "Xếp Hàng Đăng Ký", "users/online": "Thành viên trực tuyến", "users/latest": "Thành viên mới nhất", - "users/sort-posts": "Thành viên có nhiều bài đăng", - "users/sort-reputation": "Thành viên có điểm tín nhiệm cao nhất", + "users/sort-posts": "Người dùng nhiều bài đăng nhất", + "users/sort-reputation": "Người dùng uy tín cao nhất", "users/banned": "Người dùng bị cấm", - "users/most-flags": "Người dùng bị gắn cờ nhiều", + "users/most-flags": "Người dùng bị gắn cờ nhiều nhất", "users/search": "Tìm Kiếm Người Dùng", "notifications": "Thông báo", "tags": "Thẻ", @@ -47,17 +47,17 @@ "account/latest-posts": "Bài viết mới nhất do %1", "account/topics": "Chủ đề được tạo bởi %1", "account/groups": "Nhóm của %1", - "account/watched-categories": "Chuyên Mục Đã Xem Của %1", + "account/watched-categories": "Danh Mục Đã Xem Của %1", "account/watched-tags": "%1's Thẻ Đã Xem", "account/bookmarks": "Bài Đăng Được Đánh Dấu Trang Của %1", "account/settings": "Cài Đặt Người Dùng", - "account/settings-of": "Changing settings of %1", + "account/settings-of": "Thay đổi cài đặt của %1", "account/watched": "Chủ đề đã được %1 xem", "account/ignored": "Các chủ đề bị bỏ qua bởi %1", "account/upvoted": "Bài đăng được %1 ủng hộ", "account/downvoted": "Bài viết bị %1 phản đối", "account/best": "Bài viết hay nhất thuộc về %1", - "account/controversial": "Các bài đăng gây tranh cãi được thực hiện bởi %1", + "account/controversial": "Bài đăng gây tranh cãi của %1", "account/blocks": "Người dùng bị chặn vì %1", "account/uploads": "Tải lên bởi %1", "account/sessions": "Phiên Đăng Nhập", diff --git a/public/language/vi/post-queue.json b/public/language/vi/post-queue.json index 2218cc8401..3192e1c1a0 100644 --- a/public/language/vi/post-queue.json +++ b/public/language/vi/post-queue.json @@ -3,12 +3,12 @@ "post-queue": "Xếp Hàng Bài Đăng", "no-queued-posts": "Không có bài trong xếp hàng đăng bài", "no-single-post": "Chủ đề hoặc bài đăng bạn đang tìm kiếm không còn xếp hàng. Có thể đã phê duyệt hoặc xóa rồi.", - "enabling-help": "The post queue is currently disabled. To enable this feature, go to Settings → Post → Post Queue and enable Post Queue.", + "enabling-help": "Hàng đợi bài đăng hiện tại đã tắt. Để bật, đi đến Cài đặt → Đăng bài → Hàng Đợi Đăng Bài và bật Hàng Đợi Đăng Bài.", "back-to-list": "Trở về Hàng Đợi Đăng", - "public-intro": "If you have any queued posts, they will be shown here.", - "public-description": "This forum is configured to automatically queue posts from new accounts, pending moderator approval.
If you have queued posts awaiting approval, you will be able to see them here.", + "public-intro": "Nếu bạn có bất kỳ bài đăng nào được xếp hàng đợi, chúng sẽ được hiển thị ở đây.", + "public-description": "Diễn đàn này được cấu hình tự động xếp hàng các bài đăng từ tài khoản mới, chờ người điều hành phê duyệt.
Nếu bạn đã xếp hàng các bài đăng đợi phê duyệt, bạn sẽ có thể xem chúng ở đây.", "user": "Người dùng", - "when": "When", + "when": "Khi", "category": "Chuyên mục", "title": "Tiêu đề", "content": "Nội dung", @@ -38,5 +38,6 @@ "remove-selected": "Gỡ Bỏ Đã Chọn", "remove-selected-confirm": "Bạn có muốn xóa %1 bài đăng đã chọn không?", "bulk-accept-success": "%1 bài đăng được chấp nhận", - "bulk-reject-success": "%1 bài đăng bị từ chối" + "bulk-reject-success": "%1 bài đăng bị từ chối", + "links-in-this-post": "Liên kết trong bài này" } \ No newline at end of file diff --git a/public/language/vi/recent.json b/public/language/vi/recent.json index 353a0ae2d4..3fdb8b79e1 100644 --- a/public/language/vi/recent.json +++ b/public/language/vi/recent.json @@ -7,5 +7,5 @@ "alltime": "Mọi Lúc", "no-recent-topics": "Không có chủ đề gần đây.", "no-popular-topics": "Không có chủ đề nào phổ biến.", - "load-new-posts": "Load new posts" + "load-new-posts": "Tải bài đăng mới" } \ No newline at end of file diff --git a/public/language/vi/register.json b/public/language/vi/register.json index 0018ecbecc..e7f1e0afb6 100644 --- a/public/language/vi/register.json +++ b/public/language/vi/register.json @@ -13,7 +13,7 @@ "password-placeholder": "Nhập mật khẩu", "confirm-password": "Xác Nhận Mật Khẩu", "confirm-password-placeholder": "Xác Nhận Mật Khẩu", - "register-now-button": "Đăng ký ngay", + "register-now-button": "Đăng Ký Ngay", "alternative-registration": "Đăng Ký Thay Thế", "terms-of-use": "Điều khoản sử dụng", "agree-to-terms-of-use": "Tôi đồng ý với các điều khoản sử dụng", diff --git a/public/language/vi/reset_password.json b/public/language/vi/reset_password.json index f0b8c703f9..6264a428ed 100644 --- a/public/language/vi/reset_password.json +++ b/public/language/vi/reset_password.json @@ -3,7 +3,7 @@ "update-password": "Cập Nhật Mật Khẩu", "password-changed.title": "Mật Khẩu Đã Được Thay Đổi", "password-changed.message": "

Đặt lại mật khẩu thành công, vui lòng đăng nhập lại.", - "wrong-reset-code.title": "Mã thiết lập lại không đúng", + "wrong-reset-code.title": "Mã Đặt Lại Không Đúng", "wrong-reset-code.message": "Mã thiết lập lại không đúng. Xin hãy thử lại, hoặc yêu cầu một mã thiết lập lại khác.", "new-password": "Mật Khẩu Mới", "repeat-password": "Xác Nhận Mật Khẩu", diff --git a/public/language/vi/search.json b/public/language/vi/search.json index c8cc0c4c72..65e9d12113 100644 --- a/public/language/vi/search.json +++ b/public/language/vi/search.json @@ -7,7 +7,7 @@ "in-titles": "Trong tiêu đề", "in-titles-posts": "Trong tiêu đề và bài đăng", "in-posts": "Trong bài đăng", - "in-bookmarks": "In bookmarks", + "in-bookmarks": "Trong dấu trang", "in-categories": "Trong danh mục", "in-users": "Trong người dùng", "in-tags": "Trong thẻ", @@ -17,7 +17,7 @@ "categories-watched-categories": "Danh mục: Danh mục đã xem", "type-a-category": "Nhập một danh mục", "tags": "Thẻ", - "tags-x": "Tags: %1", + "tags-x": "Thẻ: %1", "type-a-tag": "Nhập một thẻ", "match-words": "Khớp các từ", "match-all-words": "Khớp tất cả các từ", @@ -26,15 +26,15 @@ "any": "Bất kì", "posted-by": "Đăng bởi", "posted-by-usernames": "Đăng bởi: %1", - "type-a-username": "Nhập tên người dùng", + "type-a-username": "Nhập tên đăng nhập", "search-child-categories": "Tìm kiếm chuyên mục con", - "has-tags": "Có thẻ bên trong", + "has-tags": "Có thẻ", "reply-count": "Số lượt trả lời", - "replies": "Replies", - "replies-atleast-count": "Replies: At least %1", - "replies-atmost-count": "Replies: At most %1", + "replies": "Trả lời", + "replies-atleast-count": "Trả lời: Ít nhất %1", + "replies-atmost-count": "Trả lời: Nhiều nhất là %1", "at-least": "Tối thiểu", - "at-most": "Tối đa", + "at-most": "Nhiều nhất", "relevance": "Mức độ liên quan", "time": "Thời gian", "post-time": "Thời gian đăng bài", diff --git a/public/language/vi/social.json b/public/language/vi/social.json index 6017a94dfc..2a1194b3fd 100644 --- a/public/language/vi/social.json +++ b/public/language/vi/social.json @@ -1,12 +1,12 @@ { - "sign-in-with-twitter": "Đăng nhập bằng Twitter", + "sign-in-with-twitter": "Đăng nhập với Twitter", "sign-up-with-twitter": "Đăng ký với Twitter", "sign-in-with-github": "Đăng nhập bằng Github", "sign-up-with-github": "Đăng ký với Github", "sign-in-with-google": "Đăng nhập bằng Google", "sign-up-with-google": "Đăng ký với Google", - "log-in-with-facebook": "Đăng nhập bằng Facebook", + "log-in-with-facebook": "Đăng nhập với Facebook", "continue-with-facebook": "Tiếp tục với Facebook", - "sign-in-with-linkedin": "Sign in with LinkedIn", - "sign-up-with-linkedin": "Sign up with LinkedIn" + "sign-in-with-linkedin": "Đăng nhập với LinkedIn", + "sign-up-with-linkedin": "Đăng ký với LinkedIn" } \ No newline at end of file diff --git a/public/language/vi/tags.json b/public/language/vi/tags.json index d5dff7118e..9e9f0d754f 100644 --- a/public/language/vi/tags.json +++ b/public/language/vi/tags.json @@ -1,17 +1,17 @@ { - "all-tags": "Tất cả các thẻ", + "all-tags": "Tất cả thẻ", "no-tag-topics": "Không có bài viết nào với thẻ này.", "no-tags-found": "Không tìm thấy thẻ nào", "tags": "Thẻ", - "enter-tags-here": "Enter tags, %1 - %2 characters.", + "enter-tags-here": "Nhập thẻ, %1 - %2 ký tự.", "enter-tags-here-short": "Nhập thẻ...", "no-tags": "Chưa có thẻ nào.", "select-tags": "Chọn Thẻ", - "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.", - "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." + "tag-whitelist": "Danh Sách Trắng Thẻ", + "watching": "Đang xem", + "not-watching": "Chưa xem", + "watching.description": "Thông báo tôi chủ đề mới.", + "not-watching.description": "Không thông báo tôi chủ đề mới.", + "following-tag.message": "Bây giờ bạn sẽ nhận được thông báo khi ai đó đăng chủ đề có thẻ này.", + "not-following-tag.message": "Bạn sẽ không nhận được thông báo khi ai đó đăng chủ đề có thẻ này.\n\n \n\n " } \ No newline at end of file diff --git a/public/language/vi/themes/harmony.json b/public/language/vi/themes/harmony.json index 994678ce86..4f7b19c44e 100644 --- a/public/language/vi/themes/harmony.json +++ b/public/language/vi/themes/harmony.json @@ -1,13 +1,14 @@ { "theme-name": "Chủ Đề Hòa Âm", - "skins": "Giao diện", + "skins": "Trang điểm", "collapse": "Thu gọn", "expand": "Mở rộng", - "sidebar-toggle": "Sidebar Toggle", + "sidebar-toggle": "Chuyển Đổi Thanh Bên", "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": "Enable breadcrumbs", + "settings.enableBreadcrumbs": "Hiển thị đường dẫn trong trang Danh mục và Chủ đề", + "settings.enableBreadcrumbs.why": "Đường dẫn được hiển thị trong hầu hết các trang để dễ điều hướng. Thiết kế cơ bản của các trang danh mục và chủ đề có các phương tiện thay thế để liên kết trở lại các trang mẹ, nhưng có thể tắt đường dẫn để giảm bớt sự lộn xộn.", "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/vi/topic.json b/public/language/vi/topic.json index 84b7d27226..19bc1289eb 100644 --- a/public/language/vi/topic.json +++ b/public/language/vi/topic.json @@ -15,7 +15,7 @@ "replies-to-this-post": "%1 trả lời", "one-reply-to-this-post": "1 Phản hồi", "last-reply-time": "Trả lời cuối cùng", - "reply-options": "Reply options", + "reply-options": "Tùy chọn trả lời", "reply-as-topic": "Trả lời dưới dạng chủ đề", "guest-login-reply": "Đăng nhập để trả lời", "login-to-view": "🔒 Đăng nhập để xem", @@ -35,7 +35,7 @@ "pinned": "Đã ghim", "pinned-with-expiry": "Được ghim cho đến %1", "scheduled": "Lên kế hoạch", - "deleted": "Deleted", + "deleted": "Đã xóa", "moved": "Chuyển đi", "moved-from": "Đã chuyển từ %1", "copy-code": "Sao Chép Mã", @@ -66,7 +66,7 @@ "user-referenced-topic-on": "%1 referenced this topic on %3", "user-forked-topic-ago": "%1 forked this topic %3", "user-forked-topic-on": "%1 forked this topic on %3", - "bookmark-instructions": "Nhấn vào đây để trở lại bài viết đã đọc cuối cùng trong chủ đề này.", + "bookmark-instructions": "Bấm vào đây để trở lại bài đọc cuối cùng trong chủ đề này.", "flag-post": "Gắn cờ bài đăng này", "flag-user": "Gắn cờ người dùng này", "already-flagged": "Đã Được Gắn Cờ", @@ -74,7 +74,7 @@ "resolve-flag": "Xử Lý Cờ", "merged-message": "Chủ đề này đã được gộp chung thành %2", "forked-message": "This topic was forked from %2", - "deleted-message": "Chủ đề này đã bị xóa. Chỉ người dùng có quyền quản lý chủ đề mới được xem.", + "deleted-message": "Chủ đề này đã bị xóa. Chỉ người dùng có đặc quyền quản lý chủ đề mới được xem.", "following-topic.message": "Bạn sẽ nhận được thông báo khi có ai đó gửi bài viết trong chủ đề này.", "not-following-topic.message": "Bạn sẽ thấy chủ đề này trong danh sách chủ đề chưa đọc, nhưng bạn sẽ không nhận được thông báo khi ai đó đăng lên chủ đề này.", "ignoring-topic.message": "Bạn sẽ không thấy chủ đề này trong danh sách chủ đề chưa đọc. Bạn sẽ nhận thông báo khi bạn được đề cập hoặc bài viết của bạn được ủng hộ.", @@ -88,7 +88,7 @@ "unwatch.title": "Ngừng xem chủ đề này", "share-this-post": "Chia sẻ bài viết này", "watching": "Đang xem", - "not-watching": "Không Xem", + "not-watching": "Chưa Xem", "ignoring": "Bỏ qua", "watching.description": "Thông báo cho tôi về trả lời mới.
Hiển thị chủ đề chưa đọc", "not-watching.description": "Không thông báo tôi các trả lời mới.
Hiển thị mục chưa đọc nếu chuyên mục bị bỏ qua.", @@ -124,7 +124,7 @@ "post-delete-confirm": "Bạn có chắc là muốn xóa bài gửi này không?", "post-restore-confirm": "Bạn có chắc muốn khôi phục bài đăng này không?", "post-purge-confirm": "Bạn có chắc muốn xóa hẳn bài này?", - "pin-modal-expiry": "Ngày hết hạn", + "pin-modal-expiry": "Ngày Hết Hạn", "pin-modal-help": "Bạn có thể đặt ngày hết hạn chủ đề được ghim tại đây. Ngoài ra, bạn có thể để trống để giữ chủ đề được ghim cho đến khi chủ đề được bỏ ghim theo cách thủ công.", "load-categories": "Đang Tải Chuyên Mục", "confirm-move": "Di chuyển", @@ -163,11 +163,11 @@ "composer.discard": "Huỷ bỏ", "composer.submit": "Gửi", "composer.additional-options": "Tùy chọn bổ sung", - "composer.post-later": "Post Later", + "composer.post-later": "Đăng Sau", "composer.schedule": "Lên lịch", "composer.replying-to": "Đang trả lời %1", "composer.new-topic": "Chủ đề mới", - "composer.editing-in": "Editing post in %1", + "composer.editing-in": "Đang sửa bài đăng trong %1", "composer.uploading": "đang tải lên...", "composer.thumb-url-label": "Dán URL hình mô tả chủ đề", "composer.thumb-title": "Thêm ảnh mô tả cho chủ đề này", @@ -182,19 +182,19 @@ "sort-by": "Sắp xếp theo", "oldest-to-newest": "Cũ đến mới", "newest-to-oldest": "Mới đến cũ", - "recently-replied": "Recently Replied", - "recently-created": "Recently Created", - "most-votes": "Nhiều Bình Chọn", - "most-posts": "Nhiều Bài Đăng", - "most-views": "Xem Nhiều", + "recently-replied": "Trả Lời Gần Đây", + "recently-created": "Đã Tạo Gần Đây", + "most-votes": "Nhiều Bình Chọn Nhất", + "most-posts": "Nhiều Bài Đăng Nhất", + "most-views": "Xem Nhiều Nhất", "stale.title": "Tạo chủ đề mới thay thế?", "stale.warning": "Chủ đề bạn đang trả lời đã khá cũ. Bạn có muốn tạo chủ đề mới, và liên kết với chủ đề hiện tại trong bài viết trả lời của bạn?", "stale.create": "Tạo chủ đề mới", "stale.reply-anyway": "Trả lời chủ đề này", - "link-back": "Re: [%1](%2)", - "diffs.title": "Lịch sử chỉnh sửa bài viết", - "diffs.description": "Bài viết này có %1 sửa đổi. Nhấp vào một trong các bản sửa đổi bên dưới để xem nội dung bài đăng tại thời điểm đó.", - "diffs.no-revisions-description": "Bài viết này có %1 sửa đổi", + "link-back": "Trả lời: [%1](%2)", + "diffs.title": "Lịch Sử Sửa Bài", + "diffs.description": "Bài này có %1 sửa đổi. Bấm vào một trong các bản sửa đổi bên dưới để xem nội dung bài tại thời điểm đó.", + "diffs.no-revisions-description": "Bài này có %1 sửa đổi", "diffs.current-revision": "bản sửa đổi hiện tại", "diffs.original-revision": "bản sửa đổi gốc", "diffs.restore": "Khôi phục bản sửa đổi này", @@ -208,13 +208,13 @@ "last-post": "Bài viết cuối cùng", "go-to-my-next-post": "Đi tới bài kế tiếp của tôi", "no-more-next-post": "Bạn không có bài viết nào khác trong chủ đề này", - "open-composer": "Open composer", + "open-composer": "Mỏ composer", "post-quick-reply": "Trả lời nhanh", "navigator.index": "Post %1 of %2", "navigator.unread": "%1 chưa đọc", - "upvote-post": "Upvote post", - "downvote-post": "Downvote post", - "post-tools": "Post tools", - "unread-posts-link": "Unread posts link", - "thumb-image": "Topic thumbnail image" + "upvote-post": "Ủng hộ bài đăng", + "downvote-post": "Phản đối bài đăng", + "post-tools": "Công cụ đăng bài", + "unread-posts-link": "Liên kết bài đăng chưa đọc", + "thumb-image": "Ảnh thumbnail chủ đề" } \ No newline at end of file diff --git a/public/language/vi/unread.json b/public/language/vi/unread.json index a976987f49..5d814d0526 100644 --- a/public/language/vi/unread.json +++ b/public/language/vi/unread.json @@ -3,14 +3,14 @@ "no-unread-topics": "Không có chủ đề chưa đọc.", "load-more": "Tải Thêm", "mark-as-read": "Đánh dấu đã đọc", - "mark-as-unread": "Mark as Unread", + "mark-as-unread": "Đánh Dấu Chưa Đọc", "selected": "Đã chọn", "all": "Tất cả", "all-categories": "Tất cả danh mục", "topics-marked-as-read.success": "Chủ đề được đánh dấu đã đọc", "all-topics": "Tất Cả Chủ Đề", "new-topics": "Chủ đề mới", - "watched-topics": "Chủ đề đã xem", - "unreplied-topics": "Chủ Đề Chưa Có Trả Lời", + "watched-topics": "Chủ Đề Đã Xem", + "unreplied-topics": "Chủ Đề Chưa Trả Lời", "multiple-categories-selected": "Chọn Nhiều" } \ No newline at end of file diff --git a/public/language/vi/uploads.json b/public/language/vi/uploads.json index f32f535b40..49d929e52d 100644 --- a/public/language/vi/uploads.json +++ b/public/language/vi/uploads.json @@ -4,6 +4,6 @@ "upload-success": "Tải tệp lên thành công!", "maximum-file-size": "Tối đa %1 kb", "no-uploads-found": "Không có tải lên được tìm thấy", - "public-uploads-info": "Các file tải lên được xuất bản, mọi người đều có thể xem được.", - "private-uploads-info": "Các file tải lên được để ở chế độ bí mật, chỉ những người dùng đăng nhập mới có thể xem." + "public-uploads-info": "Tải lên là công khai, mọi người đều xem được.", + "private-uploads-info": "Tải lên là riêng tư, những ai đã đăng nhập mới có thể xem." } \ No newline at end of file diff --git a/public/language/vi/user.json b/public/language/vi/user.json index 1480a91a23..2b59e82480 100644 --- a/public/language/vi/user.json +++ b/public/language/vi/user.json @@ -1,9 +1,9 @@ { - "user-menu": "User menu", + "user-menu": "Menu Người Dùng", "banned": "Bị cấm", - "unbanned": "Unbanned", + "unbanned": "Bỏ cấm", "muted": "Đã Im Lặng", - "unmuted": "Unmuted", + "unmuted": "Bỏ tắt tiếng", "offline": "Ngoại tuyến", "deleted": "Đã xoá", "username": "Tên Đăng Nhập", @@ -65,7 +65,7 @@ "change-picture": "Đổi Hình Ảnh", "change-username": "Đổi tên đăng nhập", "change-email": "Đổi email", - "email-updated": "Email Updated", + "email-updated": "Đã Cập Nhật Email", "email-same-as-password": "Vui lòng nhập mật khẩu hiện tại của bạn để tiếp tục – bạn đã nhập lại email mới", "edit": "Sửa", "edit-profile": "Sửa Hồ Sơ", @@ -73,11 +73,12 @@ "uploaded-picture": "Ảnh đã tải lên", "upload-new-picture": "Tải lên ảnh mới", "upload-new-picture-from-url": "Tải Lên Ảnh Mới Từ URL", - "current-password": "Mật khẩu hiện tại", + "current-password": "Mật Khẩu Hiện Tại", "new-password": "Mật Khẩu Mới", "change-password": "Đổi Mật Khẩu", "change-password-error": "Mật khẩu không hợp lệ!", - "change-password-error-wrong-current": "Mật khẩu hiện tại của bạn không đúng", + "change-password-error-wrong-current": "Mật khẩu hiện tại của bạn không đúng!", + "change-password-error-same-password": "Mật khẩu mới của bạn trùng với mật khẩu hiện tại của bạn, vui lòng sử dụng mật khẩu mới.", "change-password-error-match": "Mật khẩu phải trùng khớp!", "change-password-error-privileges": "Bạn không có quyền thay đổi mật khẩu này", "change-password-success": "Đã cập nhật mật khẩu của bạn!", @@ -91,7 +92,7 @@ "upload-a-picture": "Tải lên một hình ảnh", "remove-uploaded-picture": "Xoá ảnh đã tải lên", "upload-cover-picture": "Tải ảnh bìa lên", - "remove-cover-picture-confirm": "Bạn có thật sự muốn xóa hình ảnh này?", + "remove-cover-picture-confirm": "Bạn có chắc muốn xóa ảnh bìa này?", "crop-picture": "Cắt ảnh", "upload-cropped-picture": "Cắt và tải lên", "avatar-background-colour": "Màu nền ảnh đại diện", @@ -136,7 +137,7 @@ "upvote-notif-freq.disabled": "Đã tắt", "browsing": "Đang xem cài đặt", "open-links-in-new-tab": "Mở liên kết trong tab mới.", - "enable-topic-searching": "Bật tìm kiếm trong chủ đề", + "enable-topic-searching": "Bật Tìm Kiếm Trong Chủ Đề", "topic-search-help": "Nếu bật, tìm kiếm trong chủ đề sẽ thay thế tìm kiếm của trình duyệt và cho phép bạn tìm kiếm trong toàn bộ chủ đề, thay vì chỉ tìm kiếm nội dung đang hiện thị trên màn hình", "update-url-with-post-index": "Cập nhật url với chỉ mục bài viết trong khi duyệt các chủ đề", "scroll-to-my-post": "Sau khi đăng một trả lời thì hiển thị bài viết mới", @@ -144,36 +145,36 @@ "follow-topics-you-create": "Xem chủ đề bạn tạo", "grouptitle": "Tiêu đề nhóm", "group-order-help": "Chọn một nhóm và sử dụng các phím mũi tên để sắp xếp các tiêu đề", - "show-group-title": "Show group title", - "hide-group-title": "Hide group title", - "order-group-up": "Order group up", - "order-group-down": "Order group down", + "show-group-title": "Hiện tiêu đề nhóm", + "hide-group-title": "Ẩn tiêu đề nhóm", + "order-group-up": "Xếp nhóm lên", + "order-group-down": "Xếp nhóm xuống", "no-group-title": "Không có tiêu đề nhóm", - "select-skin": "Chọn một giao diện", + "select-skin": "Chọn Trang Điểm", "default": "Mặc định (%1)", - "no-skin": "Không Giao Diện", - "select-homepage": "Chọn Trang chủ", + "no-skin": "Không Trang Điểm", + "select-homepage": "Chọn một Trang Chủ", "homepage": "Trang chủ", "homepage-description": "Chọn một trang dùng cho trang chủ diễn đàn hoặc chọn \"Không\" để dùng trang chủ mặc định.", - "custom-route": "Đường dẫn trang chủ tuỳ chọn", - "custom-route-help": "Nhập tên đường dẫn ở đây, không có dấu gạch chéo trước (VD: \"gan-day\" hoặc \"chuyen-muc/2/thao-luan-chung\")", - "sso.title": "Đăng nhập một lần", - "sso.associated": "Đã liên kết với", - "sso.not-associated": "Nhấn vào đây để liên kết với", + "custom-route": "Định Tuyến Trang Chủ Tuỳ Chọn", + "custom-route-help": "Nhập tên đường dẫn ở đây, không có dấu gạch chéo trước (VD. \"gan-day\" or \"danh-muc/2/thao-luan-chung\")", + "sso.title": "Dịch Vụ Đăng Nhập Một Lần", + "sso.associated": "Đã kết hợp với", + "sso.not-associated": "Bấm ở đây để kết hợp với", "sso.dissociate": "Tách khỏi", "sso.dissociate-confirm-title": "Xác nhận việc tách khỏi", "sso.dissociate-confirm": "Bạn có chắc chắn muốn tách tài khoản của mình khỏi %1?", "info.latest-flags": "Gắn cờ mới nhất", - "info.profile": "Profile", - "info.post": "Post", - "info.view-flag": "View flag", - "info.reported-by": "Reported by:", + "info.profile": "Hồ sơ", + "info.post": "Bài viết", + "info.view-flag": "Xem cờ", + "info.reported-by": "Báo cáo bởi:", "info.no-flags": "Không Tìm Thấy Bài Bị Gắn Cờ", "info.ban-history": "Lịch Sử Cấm Gần Đây", "info.no-ban-history": "Người dùng này chưa bao giờ bị cấm", "info.banned-until": "Bị cấm cho đến %1", "info.banned-expiry": "Hết hạn", - "info.ban-expired": "Ban expired", + "info.ban-expired": "Hết hạn cấm", "info.banned-permanently": "Bị cấm vĩnh viễn", "info.banned-reason-label": "Lý do", "info.banned-no-reason": "Không có lí do.", @@ -182,7 +183,7 @@ "info.muted-until": "Đã tắt tiếng cho đến %1", "info.muted-expiry": "Hết hạn", "info.muted-no-reason": "Không có lý do nào được đưa ra.", - "info.username-history": "Lịch Sử Tên Người Dùng", + "info.username-history": "Lịch Sử Tên Đăng Nhập", "info.email-history": "Lịch sử email", "info.moderation-note": "Ghi chú quản lí", "info.moderation-note.success": "Đã lưu ghi chú quản lý", @@ -202,21 +203,21 @@ "consent.right-of-access": "Bạn có quyền truy cập", "consent.right-of-access-description": "Bạn có quyền truy cập bất kỳ dữ liệu trang web này thu thập. Bạn có thể lấy một bản sao của dữ liệu này bằng cách nhấp vào nút thích hợp bên dưới.", "consent.right-to-rectification": "Bạn có quyền chỉnh lý", - "consent.right-to-rectification-description": "Bạn có quyền thay đổi hoặc cập nhật bất kỳ dữ liệu không chính xác nào được cung cấp cho chúng tôi. Hồ sơ của bạn có thể được cập nhật bằng cách chỉnh sửa hồ sơ của bạn và nội dung bài đăng luôn có thể được chỉnh sửa. Nếu không đúng như vậy, hãy liên hệ nhóm quản trị của trang này.", + "consent.right-to-rectification-description": "Bạn có quyền thay đổi hoặc cập nhật dữ liệu không chính xác nào đã cung cấp cho chúng tôi. Hồ sơ của bạn có thể cập nhật bằng cách chỉnh sửa hồ sơ của bạn và nội dung bài đăng luôn có thể chỉnh sửa. Nếu không đúng, hãy liên hệ nhóm quản trị của trang này.", "consent.right-to-erasure": "Bạn có quyền xóa", "consent.right-to-erasure-description": "Bất cứ lúc nào, bạn có thể thu hồi sự đồng ý của bạn về thu thập và / hoặc xử lý dữ liệu bằng cách xóa tài khoản của bạn. Bạn có thể xóa được hồ sơ cá nhân, mặc dù nội dung bài đăng của bạn vẫn còn. Nếu bạn muốn xóa cả tài khoản và nội dung, hãy liên hệ với nhóm quản trị trang web này.", "consent.right-to-data-portability": "Bạn có quyền di chuyển dữ liệu", "consent.right-to-data-portability-description": "Bạn có thể yêu cầu chúng tôi xuất ra một bản máy có thể đọc được về bất kỳ dữ liệu thu thập về bạn và tài khoản của bạn. Bạn có thể làm như vậy bằng cách nhấp vào nút dành riêng bên dưới.", - "consent.export-profile": "Xuất Tệp Hồ Sơ (.json)", + "consent.export-profile": "Xuất Hồ Sơ (.json)", "consent.export-profile-success": "Đang xuất hồ sơ, bạn sẽ nhận được thông báo khi hoàn tất.", "consent.export-uploads": "Xuất nội dung đã tải lên (.zip)", "consent.export-uploads-success": "Đang xuất tải lên, bạn sẽ nhận được thông báo khi hoàn tất.", "consent.export-posts": "Xuất bài viết (.csv)", "consent.export-posts-success": "Đang xuất bài viết, bạn sẽ nhận được thông báo khi hoàn tất.", "emailUpdate.intro": "Vui lòng nhập địa chỉ email của bạn dưới đây. Diễn đàn này sử dụng địa chỉ email của bạn để nhận thông báo và thông báo theo lịch trình, cũng như để khôi phục tài khoản trong trường hợp mất mật khẩu.", - "emailUpdate.optional": "Mục này không bắt buộc. Bạn không có nghĩa vụ cung cấp địa chỉ email của mình, nhưng nếu không có email được xác thực, bạn sẽ không thể khôi phục tài khoản hoặc đăng nhập bằng email của mình.", + "emailUpdate.optional": "Mục này là tùy chọn. Bạn không cần cung cấp email, nhưng nếu không có email bạn sẽ không thể khôi phục tài khoản hoặc đăng nhập bằng email của mình.", "emailUpdate.required": "Trường này là bắt buộc.", - "emailUpdate.change-instructions": "Một email xác nhận sẽ được gửi đến địa chỉ email đã nhập với một liên kết duy nhất. Việc truy cập vào liên kết đó sẽ xác nhận quyền sở hữu của bạn đối với địa chỉ email và nó sẽ có hiệu lực trên tài khoản của bạn. Bất cứ lúc nào, bạn có thể cập nhật email của mình trong hồ sơ từ trong trang tài khoản của bạn.", + "emailUpdate.change-instructions": "Email xác nhận sẽ gửi đến địa chỉ email đã nhập với một liên kết duy nhất. Truy cập liên kết đó sẽ xác nhận email đó là của bạn và nó gắn liền với tài khoản của bạn. Bất cứ lúc nào, bạn có thể cập nhật email của mình trong hồ sơ từ trong trang tài khoản của bạn.", "emailUpdate.password-challenge": "Nhập mật khẩu của bạn để xác minh quyền sở hữu tài khoản.", "emailUpdate.pending": "Địa chỉ email của bạn chưa được xác nhận, nhưng một email đã được gửi đi yêu cầu xác nhận. Nếu bạn muốn vô hiệu hóa yêu cầu đó và gửi yêu cầu xác nhận mới, vui lòng điền vào mẫu dưới đây." } \ No newline at end of file diff --git a/public/language/vi/users.json b/public/language/vi/users.json index dca9e9820e..7267a2b967 100644 --- a/public/language/vi/users.json +++ b/public/language/vi/users.json @@ -1,15 +1,16 @@ { "all-users": "Tất Cả Người Dùng", + "followed-users": "Người Theo Dõi", "latest-users": "Thành viên mới nhất", "top-posters": "Thành viên đăng bài nhiều nhất", - "most-reputation": "Nhiều Uy Tín", - "most-flags": "Gắn cờ nhiều", + "most-reputation": "Uy Tín Nhất", + "most-flags": "Nhiều Cờ Nhất", "search": "Tìm kiếm", "enter-username": "Nhập tên đăng nhập để tìm", "search-user-for-chat": "Tìm kiếm người dùng để bắt đầu trò chuyện", "load-more": "Tải thêm", - "users-found-search-took": "Đã tìm thấy %1 người! Tìm kiếm mất %2 giây.", - "filter-by": "Lọc Bởi", + "users-found-search-took": "Tìm được %1 người! Tìm kiếm mất %2 giây.", + "filter-by": "Lọc Theo", "online-only": "Chỉ trực tuyến", "invite": "Mời", "prompt-email": "Thư điện tử:", diff --git a/public/language/zh-CN/admin/advanced/events.json b/public/language/zh-CN/admin/advanced/events.json index b6c3eba1c4..9c9a9bce50 100644 --- a/public/language/zh-CN/admin/advanced/events.json +++ b/public/language/zh-CN/admin/advanced/events.json @@ -9,9 +9,9 @@ "filter-type": "事件类型", "filter-start": "开始时间", "filter-end": "结束时间", - "filter-user": "Filter by User", - "filter-user.placeholder": "Type user name to filter...", - "filter-group": "Filter by Group", - "filter-group.placeholder": "Type group name to filter...", + "filter-user": "按用户过滤", + "filter-user.placeholder": "输入用户名以过滤", + "filter-group": "按用户群组过滤", + "filter-group.placeholder": "输入群组名以过滤", "filter-per-page": "每页" } \ No newline at end of file diff --git a/public/language/zh-CN/admin/dashboard.json b/public/language/zh-CN/admin/dashboard.json index 5cea605a5c..d4c79cd879 100644 --- a/public/language/zh-CN/admin/dashboard.json +++ b/public/language/zh-CN/admin/dashboard.json @@ -95,7 +95,7 @@ "expand-analytics": "展开统计数据", "clear-search-history": "清空搜索历史", "clear-search-history-confirm": "您确定您要删除搜索历史吗？", - "search-term": "Term", + "search-term": "内容", "search-count": "计数", - "view-all": "浏览全部" + "view-all": "查看全部" } diff --git a/public/language/zh-CN/admin/development/info.json b/public/language/zh-CN/admin/development/info.json index 00ceddc309..bc2790c78e 100644 --- a/public/language/zh-CN/admin/development/info.json +++ b/public/language/zh-CN/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1个节点在%2ms内响应！", "host": "主机", - "primary": "主/运行任务", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "在线", @@ -19,6 +19,7 @@ "registered": "已注册", "sockets": "接口", + "connection-count": "Connection Count", "guests": "游客", "info": "信息" diff --git a/public/language/zh-CN/admin/extend/widgets.json b/public/language/zh-CN/admin/extend/widgets.json index d88d368e44..0377d7549f 100644 --- a/public/language/zh-CN/admin/extend/widgets.json +++ b/public/language/zh-CN/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "卡", "container.card-header": "卡标题", "container.card-body": "卡内容", + "container.title": "Title", + "container.body": "Body", "container.alert": "警报", "alert.confirm-delete": "确认删除此窗口部件？", 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/admin/manage/users.json b/public/language/zh-CN/admin/manage/users.json index e474cc27d3..95d4388e59 100644 --- a/public/language/zh-CN/admin/manage/users.json +++ b/public/language/zh-CN/admin/manage/users.json @@ -4,21 +4,21 @@ "edit": "操作", "make-admin": "设为管理", "remove-admin": "取消管理员", - "change-email": "Change Email", + "change-email": "更改Email地址", "new-email": "New Email", "validate-email": "验证邮箱", "send-validation-email": "发送验证邮件", - "change-password": "Change Password", + "change-password": "更改密码", "password-reset-email": "发送密码重置邮件", "force-password-reset": "强制密码重置 & 登录用户已退出", - "ban": "Ban", - "ban-users": "Ban User(s)", + "ban": "封禁", + "ban-users": "封禁用户", "temp-ban": "暂时封禁用户", "unban": "解禁用户", "reset-lockout": "重设锁定", "reset-flags": "重设举报", - "delete": "Delete", - "delete-users": "Delete User(s)", + "delete": "删除", + "delete-users": "删除用户", "delete-content": "删除用户内容", "purge": "删除用户和内容", "download-csv": "下载CSV", @@ -86,7 +86,7 @@ "alerts.button-ban-x": "封禁 %1 名用户", "alerts.unban-success": "用户已解封!", "alerts.lockout-reset-success": "锁定已重置！", - "alerts.password-change-success": "Password(s) changed!", + "alerts.password-change-success": "密码已更改", "alerts.flag-reset-success": "举报已重置！", "alerts.no-remove-yourself-admin": "您无法撤销自己的管理员身份！", "alerts.make-admin-success": "此用户已成为管理员", @@ -112,7 +112,7 @@ "alerts.create": "创建用户", "alerts.button-create": "创建", "alerts.button-cancel": "取消", - "alerts.button-change": "Change", + "alerts.button-change": "更改", "alerts.error-passwords-different": "两次输入的密码必须相同！", "alerts.error-x": "错误

%1

", "alerts.create-success": "用户已创建！", @@ -120,8 +120,8 @@ "alerts.prompt-email": "邮件：", "alerts.email-sent-to": "已发送邀请给 %1", "alerts.x-users-found": "找到 %1 位用户（耗时 %2 秒）", - "alerts.select-a-single-user-to-change-email": "Select a single user to change email", - "export": "Export", + "alerts.select-a-single-user-to-change-email": "选择单个用户以更改其Email", + "export": "导出", "export-users-fields-title": "选择CSV文件", "export-field-email": "邮件", "export-field-username": "用户名", @@ -146,6 +146,6 @@ "export-users-started": "导出用户为 csv，这可能需要一些时间。当导出完成时你会收到通知。", "export-users-completed": "用户列表已被导出为 CSV 文件，点击以下载。", "email": "Email", - "password": "Password", - "manage": "Manage" + "password": "密码", + "manage": "管理" } \ No newline at end of file diff --git a/public/language/zh-CN/admin/settings/navigation.json b/public/language/zh-CN/admin/settings/navigation.json index b0b0d94ed7..172877bc3a 100644 --- a/public/language/zh-CN/admin/settings/navigation.json +++ b/public/language/zh-CN/admin/settings/navigation.json @@ -10,7 +10,7 @@ "id": "ID：可选", "properties": "属性：", - "show-to-groups": "Show to Groups:", + "show-to-groups": "向以下群组展示", "open-new-window": "在新窗口中打开", "dropdown": "下拉列表", "dropdown-placeholder": "将你的下拉菜单项目放在下面，即：
<li><a class="dropdown-item" href="https://myforum.com">Link 1</a></li>", diff --git a/public/language/zh-CN/admin/settings/reputation.json b/public/language/zh-CN/admin/settings/reputation.json index 6bbf2f50ce..e52b42c74e 100644 --- a/public/language/zh-CN/admin/settings/reputation.json +++ b/public/language/zh-CN/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "声望设置", "disable": "禁用声望系统", "disable-down-voting": "禁用 踩", - "votes-are-public": "公开所有投票", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "操作限制", "min-rep-upvote": "顶帖子 需要的最低声望", "upvotes-per-day": "每天顶的次数（设置为0则表示无限制）", @@ -24,7 +31,7 @@ "flags.limit-per-target-placeholder": "默认：0", "flags.limit-per-target-help": "当一个帖子或用户被举报不止一次时，每个额外的举报会被认为是一个“报告”并附加到原来的举报中。设置此选项为非零的数以限制一个帖子或用户能被举报的次数。", "flags.limit-post-flags-per-day": "用户每日最多举报帖子次数", - "flags.limit-post-flags-per-day-help": "设置为0表示禁止（默认：10）", + "flags.limit-post-flags-per-day-help": "设置为0表示禁用（默认：10）", "flags.limit-user-flags-per-day": "用户每日可以举报人数", "flags.limit-user-flags-per-day-help": "设置为0表示禁止（默认：10）", "flags.auto-flag-on-downvote-threshold": "被踩多少次数自动转为举报帖子", diff --git a/public/language/zh-CN/error.json b/public/language/zh-CN/error.json index 4b4f00050b..d69ab6db14 100644 --- a/public/language/zh-CN/error.json +++ b/public/language/zh-CN/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "抱歉，您的关于我不能超过 %1 个字符。", "cant-chat-with-yourself": "您不能和自己聊天！", "chat-restricted": "此用户限制了他的聊天消息。必须他先关注您，您才能和他聊天。", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "聊天系统已关闭", "too-many-messages": "您发送了太多消息，请稍等片刻。", "invalid-chat-message": "无效的聊天信息", diff --git a/public/language/zh-CN/flags.json b/public/language/zh-CN/flags.json index 9f215e5643..3a27c1461a 100644 --- a/public/language/zh-CN/flags.json +++ b/public/language/zh-CN/flags.json @@ -90,6 +90,6 @@ "bulk-actions": "批量操作", "bulk-resolve": "处理举报", "bulk-success": "已更新%1个举报", - "flagged-timeago": "Flagged ", + "flagged-timeago": "标记", "auto-flagged": "【自动举报】收到 %1 个踩" } \ No newline at end of file diff --git a/public/language/zh-CN/modules.json b/public/language/zh-CN/modules.json index ab79a34365..47d80bb820 100644 --- a/public/language/zh-CN/modules.json +++ b/public/language/zh-CN/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "房间 %1", "chat.chatting-with": "与聊天", - "chat.placeholder": "在此输入聊天消息，或者拖入图片，按下回车键以发送", - "chat.placeholder.mobile": "在此输入聊天信息", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "转到最近的信息", "chat.usernames-and-x-others": "%1 和 %2 其他人", "chat.chat-with-usernames": "与聊天", diff --git a/public/language/zh-CN/notifications.json b/public/language/zh-CN/notifications.json index 981482c16c..4f7ee60a75 100644 --- a/public/language/zh-CN/notifications.json +++ b/public/language/zh-CN/notifications.json @@ -25,42 +25,42 @@ "my-flags": "指派举报给我", "bans": "封禁", "new-message-from": "来自 %1 的新消息", - "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", + "new-messages-from": "%2的%1新信息", + "new-message-in": "%1的新消息", + "new-messages-in": " %2的 %1 个新消息", + "user-posted-in-public-room": "%1 在%3发表", + "user-posted-in-public-room-dual": "%1 和 %2 在 %4发表", + "user-posted-in-public-room-triple": "%1, %2 和%3 在%5发表", + "user-posted-in-public-room-multiple": "%1, %2 和 %3 其他人在 %5发表", "upvoted-your-post-in": "%1 在 %2 点赞了您的帖子。", "upvoted-your-post-in-dual": "%1 和 %2 在 %3 赞了您的帖子。", - "upvoted-your-post-in-triple": "%1, %2 and %3 have upvoted your post in %4.", - "upvoted-your-post-in-multiple": "%1, %2 and %3 others have upvoted your post in %4.", + "upvoted-your-post-in-triple": "%1, %2 和 %3 赞同了您在 %4的帖子。", + "upvoted-your-post-in-multiple": "%1, %2和其余 %3 位 赞同了您在%4的帖子", "moved-your-post": "您的帖子已被 %1 移动到了 %2", "moved-your-topic": "%1 移动了 %2", "user-flagged-post-in": "%1 在 %2 标记了一个帖子", "user-flagged-post-in-dual": "%1 和 %2 在 %3 举报了一个帖子", - "user-flagged-post-in-triple": "%1, %2 and %3 flagged a post in %4", - "user-flagged-post-in-multiple": "%1, %2 and %3 others flagged a post in %4", + "user-flagged-post-in-triple": "%1, %2 和 %3 在%4中标记了一个帖子", + "user-flagged-post-in-multiple": "%1, %2 和其余 %3 人在 %4中标记了一个帖子", "user-flagged-user": "%1 举报了 (%2) 的用户资料", "user-flagged-user-dual": "%1 和 %2 举报了 (%3) 的用户资料", - "user-flagged-user-triple": "%1, %2 and %3 flagged a user profile (%4)", - "user-flagged-user-multiple": "%1, %2 and %3 others flagged a user profile (%4)", + "user-flagged-user-triple": "%1, %2 和 %3 标记了一个用户资料 (%4)", + "user-flagged-user-multiple": "%1, %2 和其余 %3 人 标记了一个用户资料 (%4)", "user-posted-to": "%1 回复了：%2", "user-posted-to-dual": "%1 和 %2 回复了: %3", - "user-posted-to-triple": "%1, %2 and %3 have posted replies to: %4", - "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", + "user-posted-to-triple": "%1, %2 和 %3 对%4发表回复", + "user-posted-to-multiple": "%1, %2 和其余 %3 人 对%4发表回复", "user-posted-topic": "%1 发表了新主题：%2", "user-edited-post": "%1 在 %2 编辑了一个帖子", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1发表了%2(标签 %3)", + "user-posted-topic-with-tag-dual": "%1 发表了 %2 (标签：%3 和 %4)", + "user-posted-topic-with-tag-triple": "%1 发表了 %2 (标签： %3, %4, 和 %5)", + "user-posted-topic-with-tag-multiple": "%1发表了 %2 (标签： %3)", "user-posted-topic-in-category": "%1 发表了新主题：%2", "user-started-following-you": "%1关注了您。", "user-started-following-you-dual": "%1 和 %2 关注了您。", - "user-started-following-you-triple": "%1, %2 and %3 started following you.", - "user-started-following-you-multiple": "%1, %2 and %3 others started following you.", + "user-started-following-you-triple": "%1, %2 和%3 关注了您", + "user-started-following-you-multiple": "%1, %2和其他 %3 人 关注了您", "new-register": "%1 发出了注册请求", "new-register-multiple": "有 %1 条注册申请等待批准。", "flag-assigned-to-you": "举报 %1 已经被指派给您", @@ -75,6 +75,7 @@ "email-confirmed": "电子邮箱已确认", "email-confirmed-message": "感谢您验证您的电子邮箱。您的帐户现已完全激活。", "email-confirm-error-message": "验证的您电子邮箱地址时出现了问题。可能是因为验证码无效或已过期。", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "确认邮件已发送。", "none": "无", "notification-only": "用通知提醒我", @@ -82,14 +83,14 @@ "notification-and-email": "同时使用 通知 和 邮件 提醒我", "notificationType-upvote": "当有人顶了我的帖子时", "notificationType-new-topic": "当您关注的人发布了主题时", - "notificationType-new-topic-with-tag": "When a topic is posted with a tag you follow", - "notificationType-new-topic-in-category": "当你关注的版块有主题发布时", + "notificationType-new-topic-with-tag": "已发布的主题中有您关注的标签", + "notificationType-new-topic-in-category": "当您关注的版块有主题发布时", "notificationType-new-reply": "当您正在查看的主题中有新回复时", "notificationType-post-edit": "当您关注的主题有帖子被编辑时", "notificationType-follow": "当有人关注您时", "notificationType-new-chat": "当您收到聊天消息时", "notificationType-new-group-chat": "当您收到群聊消息时", - "notificationType-new-public-chat": "When you receive a public group chat message", + "notificationType-new-public-chat": "当您收到公共群聊消息时", "notificationType-group-invite": "当您收到用户组邀请时", "notificationType-group-leave": "当用户离开您的用户组时", "notificationType-group-request-membership": "当有人请求加入您拥有的用户组时", @@ -97,5 +98,5 @@ "notificationType-post-queue": "当有新帖子等待审核时", "notificationType-new-post-flag": "当有新的帖子举报时", "notificationType-new-user-flag": "当有新的用户信息举报时", - "notificationType-new-reward": "当你获得新奖励时" + "notificationType-new-reward": "当您获得新奖励时" } \ No newline at end of file diff --git a/public/language/zh-CN/post-queue.json b/public/language/zh-CN/post-queue.json index 7d318866e8..a1a5d47414 100644 --- a/public/language/zh-CN/post-queue.json +++ b/public/language/zh-CN/post-queue.json @@ -3,7 +3,7 @@ "post-queue": "发布队列", "no-queued-posts": "发帖队列中没有帖子。", "no-single-post": "您正在查看的主题或帖子已经不在队列中。它可能已经被批准或删除。", - "enabling-help": "The post queue is currently disabled. To enable this feature, go to Settings → Post → Post Queue and enable Post Queue.", + "enabling-help": "发帖队列已禁用，要启用，请转到设置→帖子→发帖队列然后启用发帖队列", "back-to-list": "回到发帖队列", "public-intro": "如果你有帖子等待发布，它们会显示在这里", "public-description": "本论坛设置为新用户帖子进入发布队列，等待版主审核。
如果你有帖子等待发布，它们会显示在这里。", @@ -38,5 +38,6 @@ "remove-selected": "移除所选内容", "remove-selected-confirm": "你想删除%1的选定帖子吗？", "bulk-accept-success": "%1个帖子已接受", - "bulk-reject-success": "%1个帖子已拒绝" + "bulk-reject-success": "%1个帖子已拒绝", + "links-in-this-post": "帖子中的链接" } \ No newline at end of file diff --git a/public/language/zh-CN/rewards.json b/public/language/zh-CN/rewards.json index dbc21866b0..af17f593fa 100644 --- a/public/language/zh-CN/rewards.json +++ b/public/language/zh-CN/rewards.json @@ -1,6 +1,6 @@ { - "awarded-x-reputation": "你已经获得%1声望", - "awarded-group-membership": "你已加入群组%1", + "awarded-x-reputation": "您已经获得%1声望", + "awarded-group-membership": "您已加入群组%1", "essentials/user.reputation-conditional-value": "（声望%1 %2）", "essentials/user.postcount-conditional-value": "（帖子数%1 %2）", 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/topic.json b/public/language/zh-CN/topic.json index 42a6d6a334..fb3078b586 100644 --- a/public/language/zh-CN/topic.json +++ b/public/language/zh-CN/topic.json @@ -42,10 +42,10 @@ "copy-ip": "复制IP", "ban-ip": "封禁 IP", "view-history": "编辑历史", - "wrote-ago": "编写", + "wrote-ago": "编写于", "wrote-on": "写于", "replied-to-user-ago": "回复了%3 ", - "replied-to-user-on": "在 中回复了 %3", + "replied-to-user-on": "在 回复了 %3", "user-locked-topic-ago": "%1 锁定了该主题 %2", "user-locked-topic-on": "%1 在 %2 中锁定了该主题", "user-unlocked-topic-ago": "%1 解锁了该主题 %2", @@ -72,8 +72,8 @@ "already-flagged": "已举报", "view-flag-report": "查看举报报告", "resolve-flag": "解决举报", - "merged-message": "此主题已并入%2", - "forked-message": "This topic was forked from %2", + "merged-message": "此主题已合并到%2", + "forked-message": "此主题由 %2 分支而来", "deleted-message": "此主题已被删除。只有拥有主题管理权限的用户可以查看。", "following-topic.message": "当有人回复此主题时，您会收到通知。", "not-following-topic.message": "您将在未读主题列表中看到这个主题，但您不会在帖子被回复时收到通知。", @@ -210,7 +210,7 @@ "no-more-next-post": "您在此主题中没有更多的帖子了", "open-composer": "打开编辑器", "post-quick-reply": "快速回复", - "navigator.index": "发布 %2 的 %1", + "navigator.index": "%1 / %2", "navigator.unread": "未读 %1", "upvote-post": "顶贴", "downvote-post": "踩帖", diff --git a/public/language/zh-CN/user.json b/public/language/zh-CN/user.json index 5ce0e61c62..d2005b70fa 100644 --- a/public/language/zh-CN/user.json +++ b/public/language/zh-CN/user.json @@ -1,9 +1,9 @@ { "user-menu": "用户菜单", "banned": "已封禁", - "unbanned": "Unbanned", + "unbanned": "未被封禁", "muted": "禁言", - "unmuted": "Unmuted", + "unmuted": "未被禁言", "offline": "离线", "deleted": "已删除", "username": "用户名", @@ -78,6 +78,7 @@ "change-password": "更改密码", "change-password-error": "无效的密码！", "change-password-error-wrong-current": "您的当前密码不正确！", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "两次输入的密码必须相同！", "change-password-error-privileges": "您无权更改此密码。", "change-password-success": "您的密码已更新！", @@ -138,7 +139,7 @@ "open-links-in-new-tab": "在新标签打开外部链接", "enable-topic-searching": "启用主题内搜索", "topic-search-help": "如果启用此项，主题内搜索会替代浏览器默认的页面搜索，您将可以在整个主题内搜索，而不仅仅只搜索页面上展现的内容。", - "update-url-with-post-index": "浏览主题是更新链接和索引", + "update-url-with-post-index": "浏览帖子时 URL 跟随浏览中的楼层变化", "scroll-to-my-post": "在提交回复之后显示新回复", "follow-topics-you-reply-to": "关注您回复过的主题", "follow-topics-you-create": "关注您创建的主题", @@ -164,16 +165,16 @@ "sso.dissociate-confirm-title": "确认解除关联", "sso.dissociate-confirm": "您确定您要将您的账号与 %1 解除关联吗？", "info.latest-flags": "最新举报", - "info.profile": "Profile", - "info.post": "Post", - "info.view-flag": "View flag", - "info.reported-by": "Reported by:", + "info.profile": "资料", + "info.post": "帖子", + "info.view-flag": "查看举报", + "info.reported-by": "举报者：", "info.no-flags": "没有找到被举报的帖子", "info.ban-history": "最近封禁历史", "info.no-ban-history": "该用户从未被封禁", "info.banned-until": "封禁到 %1", "info.banned-expiry": "到期", - "info.ban-expired": "Ban expired", + "info.ban-expired": "封禁过期", "info.banned-permanently": "永久封禁", "info.banned-reason-label": "原因", "info.banned-no-reason": "没有原因", diff --git a/public/language/zh-CN/users.json b/public/language/zh-CN/users.json index 7557b7cbdc..cd9db8116c 100644 --- a/public/language/zh-CN/users.json +++ b/public/language/zh-CN/users.json @@ -1,5 +1,6 @@ { "all-users": "所有用户", + "followed-users": "Followed Users", "latest-users": "最新用户", "top-posters": "发帖排行", "most-reputation": "声望排行", diff --git a/public/language/zh-TW/admin/development/info.json b/public/language/zh-TW/admin/development/info.json index 9b2d42dcfd..da81891ca4 100644 --- a/public/language/zh-TW/admin/development/info.json +++ b/public/language/zh-TW/admin/development/info.json @@ -3,7 +3,7 @@ "ip": "IP %1", "nodes-responded": "%1個節點在%2ms內響應！", "host": "主機", - "primary": "primary / run jobs", + "primary": "primary / jobs", "pid": "pid", "nodejs": "nodejs", "online": "在線", @@ -19,6 +19,7 @@ "registered": "已註冊", "sockets": "網路接口", + "connection-count": "Connection Count", "guests": "訪客", "info": "資訊" diff --git a/public/language/zh-TW/admin/extend/widgets.json b/public/language/zh-TW/admin/extend/widgets.json index 06e48f3a24..b203d05a07 100644 --- a/public/language/zh-TW/admin/extend/widgets.json +++ b/public/language/zh-TW/admin/extend/widgets.json @@ -12,6 +12,8 @@ "container.card": "Card", "container.card-header": "Card Header", "container.card-body": "Card Body", + "container.title": "Title", + "container.body": "Body", "container.alert": "警示", "alert.confirm-delete": "確認刪除此小工具？", diff --git a/public/language/zh-TW/admin/settings/reputation.json b/public/language/zh-TW/admin/settings/reputation.json index 09a78a7428..223c9fff4a 100644 --- a/public/language/zh-TW/admin/settings/reputation.json +++ b/public/language/zh-TW/admin/settings/reputation.json @@ -2,7 +2,14 @@ "reputation": "聲望設定", "disable": "停用 聲望系統", "disable-down-voting": "停用 倒讚", - "votes-are-public": "公開所有讚", + "upvote-visibility": "Up Vote visibility", + "upvote-visibility-all": "Everyone can see up votes", + "upvote-visibility-loggedin": "Only logged in users can see up votes", + "upvote-visibility-privileged": "Only privileged users like admins & moderators can see up votes", + "downvote-visibility": "Down Vote visibility", + "downvote-visibility-all": "Everyone can see down votes", + "downvote-visibility-loggedin": "Only logged in users can see down votes", + "downvote-visibility-privileged": "Only privileged users like admins & moderators can see down votes", "thresholds": "操作限制", "min-rep-upvote": "Minimum reputation to upvote posts", "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", diff --git a/public/language/zh-TW/error.json b/public/language/zh-TW/error.json index 9f3480df1b..9e88fef2af 100644 --- a/public/language/zh-TW/error.json +++ b/public/language/zh-TW/error.json @@ -153,6 +153,7 @@ "about-me-too-long": "抱歉，您的關於我不能超過 %1 個字元。", "cant-chat-with-yourself": "您不能和自己聊天！", "chat-restricted": "此使用者限制了他的聊天訊息。必須他先追隨您，您才能和他聊天。", + "chat-user-blocked": "You have been blocked by this user.", "chat-disabled": "聊天系統已關閉", "too-many-messages": "您發送了太多訊息，請稍等片刻。", "invalid-chat-message": "無效的聊天訊息", diff --git a/public/language/zh-TW/modules.json b/public/language/zh-TW/modules.json index a1ff97dea8..bb7fc2b41d 100644 --- a/public/language/zh-TW/modules.json +++ b/public/language/zh-TW/modules.json @@ -1,8 +1,9 @@ { "chat.room-id": "Room %1", "chat.chatting-with": "與聊天", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", - "chat.placeholder.mobile": "Type chat message here", + "chat.placeholder": "Type chat message here, drag & drop images", + "chat.placeholder.mobile": "Type chat message", + "chat.placeholder.message-room": "Message #%1", "chat.scroll-up-alert": "Go to most recent message", "chat.usernames-and-x-others": "%1 & %2 others", "chat.chat-with-usernames": "Chat with %1", diff --git a/public/language/zh-TW/notifications.json b/public/language/zh-TW/notifications.json index a136577f77..fbb6941c6e 100644 --- a/public/language/zh-TW/notifications.json +++ b/public/language/zh-TW/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", "user-posted-topic": "%1 發表了新主題：%2", "user-edited-post": "%1 在 %2編輯了一則貼文", - "user-posted-topic-with-tag": "%1 has posted a new topic with tag %2", - "user-posted-topic-with-tag-dual": "%1 has posted a new topic with tags %2 and %3", - "user-posted-topic-with-tag-triple": "%1 has posted a new topic with tags %2, %3 and %4", - "user-posted-topic-with-tag-multiple": "%1 has posted a new topic with tags %2", + "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", + "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", + "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", "user-posted-topic-in-category": "%1 has posted a new topic in %2", "user-started-following-you": "%1追隨了您。", "user-started-following-you-dual": "%1 和 %2 追隨了您。", @@ -75,6 +75,7 @@ "email-confirmed": "電子信箱已確認", "email-confirmed-message": "感謝您驗證您的電子信箱。您的帳戶現已完全啟用。", "email-confirm-error-message": "驗證的您電子信箱地址時出現了問題。可能是因為驗證碼無效或已過期。", + "email-confirm-error-message-already-validated": "Your email address was already validated.", "email-confirm-sent": "確認郵件已發送。", "none": "不通知", "notification-only": "頁面提醒", diff --git a/public/language/zh-TW/post-queue.json b/public/language/zh-TW/post-queue.json index f18668f641..bcfaf69460 100644 --- a/public/language/zh-TW/post-queue.json +++ b/public/language/zh-TW/post-queue.json @@ -38,5 +38,6 @@ "remove-selected": "Remove Selected", "remove-selected-confirm": "Do you want to remove %1 selected posts?", "bulk-accept-success": "%1 posts accepted", - "bulk-reject-success": "%1 posts rejected" + "bulk-reject-success": "%1 posts rejected", + "links-in-this-post": "Links in this post" } \ No newline at end of file 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/language/zh-TW/user.json b/public/language/zh-TW/user.json index 5a08fe71d9..f3c1dbf068 100644 --- a/public/language/zh-TW/user.json +++ b/public/language/zh-TW/user.json @@ -78,6 +78,7 @@ "change-password": "更改密碼", "change-password-error": "無效的密碼！", "change-password-error-wrong-current": "您的當前密碼不正確！", + "change-password-error-same-password": "Your new password matches your current password, please use a new password.", "change-password-error-match": "兩次輸入的密碼必須相同！", "change-password-error-privileges": "您無權更改此密碼。", "change-password-success": "您的密碼已更新！", diff --git a/public/language/zh-TW/users.json b/public/language/zh-TW/users.json index 32f803ff9f..87272ae2fb 100644 --- a/public/language/zh-TW/users.json +++ b/public/language/zh-TW/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "最新使用者", "top-posters": "發文排行", "most-reputation": "聲望排行", 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.yaml b/public/openapi/write.yaml index c59b9bce29..29f31a9f62 100644 --- a/public/openapi/write.yaml +++ b/public/openapi/write.yaml @@ -164,6 +164,8 @@ paths: $ref: 'write/topics/tid/read.yaml' /topics/{tid}/bump: $ref: 'write/topics/tid/bump.yaml' + /topics/{tid}/move: + $ref: 'write/topics/tid/move.yaml' /tags/{tag}/follow: $ref: 'write/tags/tag/follow.yaml' /posts/{pid}: diff --git a/public/openapi/write/topics/tid/move.yaml b/public/openapi/write/topics/tid/move.yaml new file mode 100644 index 0000000000..6c8dedc11a --- /dev/null +++ b/public/openapi/write/topics/tid/move.yaml @@ -0,0 +1,29 @@ +put: + tags: + - topics + summary: move topic to another category + description: | + This operation moved a topic from one category to another. + + **Note**: This is a privileged call and can only be executed by administrators, global moderators, or the moderator for the category of the passed-in topic. + parameters: + - in: path + name: tid + schema: + type: string + required: true + description: a valid topic id + example: 1 + responses: + '200': + description: Topic successfully moved + content: + application/json: + schema: + type: object + properties: + status: + $ref: ../../../components/schemas/Status.yaml#/Status + response: + type: object + properties: {} \ 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/public/scss/admin/admin.scss b/public/scss/admin/admin.scss index 2d9295d128..a07f7779ee 100644 --- a/public/scss/admin/admin.scss +++ b/public/scss/admin/admin.scss @@ -153,11 +153,13 @@ body { } } -.dropdown-left .dropdown-menu { - --bs-position: start; +.dropdown-left { + [component="category-selector-search"] { left:0!important; } + .dropdown-menu { --bs-position: start; } } -.dropdown-right .dropdown-menu { - --bs-position: end; +.dropdown-right { + [component="category-selector-search"] { right:0!important; } + .dropdown-menu { --bs-position: end; } } [component="category-selector"] { diff --git a/public/scss/admin/common.scss b/public/scss/admin/common.scss index 945c5b89e3..81e74f3289 100644 --- a/public/scss/admin/common.scss +++ b/public/scss/admin/common.scss @@ -13,43 +13,19 @@ .tracking-tight { letter-spacing: -0.02em; } -@mixin btn-ghost-base { - display: flex; - align-items: center; - justify-content: center; - gap: ($spacer * 0.5); - border-radius: $border-radius-sm; - border-width: 1px; - border-color: transparent; - background-color: transparent; - padding: ($spacer * 0.25) ($spacer * 0.5); - text-align: left; - --bs-text-opacity: 1; - color: $btn-ghost-color; - font-family: $font-family-secondary; - cursor: pointer; - &:hover, &.active { - background-color: $btn-ghost-hover-color; - text-decoration: none; - } -} - +// https://getbootstrap.com/docs/5.3/components/buttons/#variables .btn-ghost { - @include btn-ghost-base(); - line-height: 1.5rem; - > i { - line-height: 1.5rem; - } + --bs-btn-color: #{$btn-ghost-color}; + --bs-btn-bg: transparent; + --bs-btn-border-color: transparent; + --bs-btn-box-shadow: none; + --bs-btn-hover-color: #{$btn-ghost-color}; + --bs-btn-hover-bg: #{$btn-ghost-hover-color}; + --bs-btn-hover-border-color: #{$btn-ghost-hover-color}; + --bs-btn-active-bg: #{$btn-ghost-hover-color}; + --bs-btn-active-border-color: transparent; } -.btn-ghost-sm { - @include btn-ghost-base(); - font-size: 0.875rem; - line-height: 1.25rem; - > i { - line-height: 1.25rem; - } -} @include color-mode(dark) { .btn-light { @@ -58,10 +34,11 @@ .text-bg-light { @extend .text-bg-dark; } - .btn-ghost, .btn-ghost-sm { + .btn-ghost { color: $btn-ghost-color-dark; &:hover, &.active { background-color: $btn-ghost-hover-color-dark; + border-color: $btn-ghost-hover-color-dark; } } } diff --git a/public/scss/admin/sidebar.scss b/public/scss/admin/sidebar.scss index 0a354fdd6c..0ca0d252d0 100644 --- a/public/scss/admin/sidebar.scss +++ b/public/scss/admin/sidebar.scss @@ -1,12 +1,12 @@ #sidebar-left, #offcanvas { - .btn-ghost, .btn-ghost-sm { + .btn-ghost { i { color: $gray-500; } } .accordion-body { - .btn-ghost-sm { + .btn-ghost.btn-sm { padding-left: 38px!important; } } diff --git a/public/scss/btn-ghost.scss b/public/scss/btn-ghost.scss index 80b819171a..6f69b8cddc 100644 --- a/public/scss/btn-ghost.scss +++ b/public/scss/btn-ghost.scss @@ -12,40 +12,15 @@ $btn-ghost-active-color-dark: lighten($btn-ghost-hover-color-dark, 5%)!default; --btn-ghost-active-color: #{$btn-ghost-active-color-dark}; } -@mixin btn-ghost-base { - display: flex; - align-items: center; - justify-content: center; - gap: ($spacer * 0.5); - border-radius: $border-radius-sm; - border-width: 1px; - border-color: transparent; - background-color: transparent; - box-shadow: none; - padding: ($spacer * 0.25) ($spacer * 0.5); - text-align: left; - --bs-text-opacity: 1; - color: inherit !important; - cursor: pointer; - &:hover, &.active { - background-color: var(--btn-ghost-hover-color); - text-decoration: none; - } -} - +// https://getbootstrap.com/docs/5.3/components/buttons/#variables .btn-ghost { - @include btn-ghost-base(); - line-height: 1.5rem; - > i { - line-height: 1.5rem; - } -} - -.btn-ghost-sm { - @include btn-ghost-base(); - font-size: 0.875rem; - line-height: 1.25rem; - > i { - line-height: 1.25rem; - } + --bs-btn-color: inherit!important; + --bs-btn-bg: transparent; + --bs-btn-border-color: transparent; + --bs-btn-box-shadow: none; + --bs-btn-hover-color: inherit; + --bs-btn-hover-bg: #{$btn-ghost-hover-color}; + --bs-btn-hover-border-color: #{$btn-ghost-hover-color}; + --bs-btn-active-bg: #{$btn-ghost-hover-color}; + --bs-btn-active-border-color: transparent; } \ No newline at end of file diff --git a/public/scss/generics.scss b/public/scss/generics.scss index 3b28362c71..c44f0e2caa 100644 --- a/public/scss/generics.scss +++ b/public/scss/generics.scss @@ -23,11 +23,13 @@ display: block; } } -.dropdown-left .dropdown-menu { - --bs-position: start; +.dropdown-left { + [component="category-selector-search"] { left:0!important; } + .dropdown-menu { --bs-position: start; } } -.dropdown-right .dropdown-menu { - --bs-position: end; +.dropdown-right { + [component="category-selector-search"] { right:0!important; } + .dropdown-menu { --bs-position: end; } } .category-dropdown-menu { diff --git a/public/scss/global.scss b/public/scss/global.scss index ab7d569242..02385fff75 100644 --- a/public/scss/global.scss +++ b/public/scss/global.scss @@ -36,4 +36,11 @@ html[data-dir="rtl"] { h5 { font-size: 1.125rem; } h6 { font-size: 1rem; } } +} + +.btn-link { + &:hover, &.active { + background-color: var(--btn-ghost-hover-color); + text-decoration: none; + } } \ No newline at end of file diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.js index 5d33b4d9b5..6a8816d5a4 100644 --- a/public/src/admin/extend/plugins.js +++ b/public/src/admin/extend/plugins.js @@ -198,10 +198,10 @@ define('admin/extend/plugins', [
  • ${plugin}
    -
    +
    -
    +
    diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js index de7cd48096..0721d8c209 100644 --- a/public/src/admin/settings.js +++ b/public/src/admin/settings.js @@ -21,7 +21,7 @@ define('admin/settings', [ if (anchor.startsWith('section')) { $this.parent().attr('id', anchor); } - tocList.append(`${header}`); + tocList.append(`${header}`); }); const offset = mainHader.outerHeight(true); // https://stackoverflow.com/a/11814275/583363 diff --git a/public/src/client/chats.js b/public/src/client/chats.js index af18c73ec2..4181bd79cb 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -11,7 +11,7 @@ define('forum/chats', [ 'forum/chats/user-list', 'forum/chats/message-search', 'forum/chats/pinned-messages', - 'composer/autocomplete', + 'autocomplete', 'hooks', 'bootbox', 'alerts', @@ -684,31 +684,6 @@ define('forum/chats', [ }; Chats.addSocketListeners = function () { - socket.on('event:new_notification', async function (notif) { - const { type, roomId } = notif; - if (ajaxify.data.template.chats && app.user.userslug && (type === 'new-chat' || type === 'new-group-chat')) { - const inRoom = parseInt(roomId, 10) === parseInt(ajaxify.data.roomId, 10); - if (inRoom) { - return; - } - const { rooms } = await api.get(`/chats`, { start: 0, perPage: 1 }); - const room = rooms.find(r => parseInt(r.roomId, 10) === parseInt(roomId, 10)); - if (room) { - const roomEl = chatNavWrapper.find(`[data-roomid="${roomId}"]`); - if (roomEl.length) { - updateTeaser(roomId, room.teaser); - } else { - const recentEl = components.get('chat/recent'); - const html = await app.parseAndTranslate('chats', 'rooms', { - rooms: [room], - showBottomHr: true, - }); - recentEl.prepend(html); - } - } - } - }); - socket.on('event:chats.receive', function (data) { if (chatModule.isFromBlockedUser(data.fromUid)) { return; @@ -723,7 +698,7 @@ define('forum/chats', [ data.message.timestampISO = utils.toISOString(data.message.timestamp); messages.appendChatMessage($('[component="chat/message/content"]'), data.message); - updateTeaser(data.roomId, { + Chats.updateTeaser(data.roomId, { content: utils.stripHTMLTags(utils.decodeHTMLEntities(data.message.content)), user: data.message.fromUser, timestampISO: data.message.timestampISO, @@ -731,17 +706,6 @@ define('forum/chats', [ } }); - async function updateTeaser(roomId, teaser) { - const roomEl = $(`[data-roomid="${roomId}"]`); - if (roomEl.length) { - const html = await app.parseAndTranslate('partials/chats/room-teaser', { - teaser: teaser, - }); - roomEl.find('[component="chat/room/teaser"]').html(html[0].outerHTML); - roomEl.find('.timeago').timeago(); - } - } - socket.on('event:chats.public.unread', function (data) { if ( chatModule.isFromBlockedUser(data.fromUid) || @@ -796,6 +760,31 @@ define('forum/chats', [ }); }; + Chats.updateTeaser = async function (roomId, teaser) { + if (!ajaxify.data.template.chats || !app.user.userslug) { + return; + } + const roomEl = chatNavWrapper.find(`[data-roomid="${roomId}"]`); + if (roomEl.length) { + const html = await app.parseAndTranslate('partials/chats/room-teaser', { + teaser: teaser, + }); + roomEl.find('[component="chat/room/teaser"]').html(html[0].outerHTML); + roomEl.find('.timeago').timeago(); + } else { + const { rooms } = await api.get(`/chats`, { start: 0, perPage: 2 }); + const room = rooms.find(r => parseInt(r.roomId, 10) === parseInt(roomId, 10)); + if (room) { + const recentEl = components.get('chat/recent'); + const html = await app.parseAndTranslate('chats', 'rooms', { + rooms: [room], + showBottomHr: true, + }); + recentEl.prepend(html); + } + } + }; + Chats.markChatPageElUnread = function (data) { if (!ajaxify.data.template.chats) { return; diff --git a/public/src/client/header/chat.js b/public/src/client/header/chat.js index a087a45939..d52f4c6c72 100644 --- a/public/src/client/header/chat.js +++ b/public/src/client/header/chat.js @@ -42,6 +42,7 @@ define('forum/header/chat', [ return; } chatPage.markChatPageElUnread(data); + chatPage.updateTeaser(data.roomId, data.teaser); } let { count } = await api.get('/chats/unread'); diff --git a/public/src/client/header/unread.js b/public/src/client/header/unread.js index 0d67c22526..d7cee4f71e 100644 --- a/public/src/client/header/unread.js +++ b/public/src/client/header/unread.js @@ -97,14 +97,16 @@ define('forum/header/unread', ['hooks'], function (hooks) { .toggleClass('hidden', count <= 0) .text(count); - // persona mobile menu uses data-content - $('#mobile-menu [data-unread-url="' + url + '"]') - .attr('data-content', countText); + if (navLink.length) { + // persona mobile menu uses data-content + $('#mobile-menu [data-unread-url="' + url + '"]') + .attr('data-content', countText); - // harmony mobile unread badge, doesn't use data-content - $('[component="unread/count"][data-unread-url="' + url + '"]') - .toggleClass('hidden', count <= 0) - .text(countText); + // harmony mobile unread badge, doesn't use data-content + $('[component="unread/count"][data-unread-url="' + url + '"]') + .toggleClass('hidden', count <= 0) + .text(countText); + } hooks.fire('action:unread.updateCount', { url, count }); } diff --git a/public/src/client/infinitescroll.js b/public/src/client/infinitescroll.js index 838f164f32..eaf3e97720 100644 --- a/public/src/client/infinitescroll.js +++ b/public/src/client/infinitescroll.js @@ -20,8 +20,9 @@ define('forum/infinitescroll', ['hooks', 'alerts', 'api'], function (hooks, aler } previousScrollTop = $(window).scrollTop(); $(window).off('scroll', startScrollTimeout).on('scroll', startScrollTimeout); - - if ($body.height() <= $(window).height()) { + if ($body.height() <= $(window).height() && ( + !ajaxify.data.hasOwnProperty('pageCount') || ajaxify.data.pageCount > 1 + )) { callback(1); } }; diff --git a/public/src/modules/autocomplete.js b/public/src/modules/autocomplete.js index 277859ce3d..13e4e56427 100644 --- a/public/src/modules/autocomplete.js +++ b/public/src/modules/autocomplete.js @@ -1,6 +1,8 @@ 'use strict'; -define('autocomplete', ['api', 'alerts'], function (api, alerts) { +define('autocomplete', [ + 'api', 'alerts', '@textcomplete/core', '@textcomplete/textarea', '@textcomplete/contenteditable', +], function (api, alerts, { Textcomplete }, { TextareaEditor }, { ContenteditableEditor }) { const autocomplete = {}; const _default = { delay: 200, @@ -129,5 +131,37 @@ define('autocomplete', ['api', 'alerts'], function (api, alerts) { onselect(event, ui); } + // This is a generic method that is also used by the chat + autocomplete.setup = function ({ element, strategies, options }) { + const targetEl = element.get(0); + if (!targetEl) { + return; + } + var editor; + if (targetEl.nodeName === 'TEXTAREA' || targetEl.nodeName === 'INPUT') { + editor = new TextareaEditor(targetEl); + } else if (targetEl.nodeName === 'DIV' && targetEl.getAttribute('contenteditable') === 'true') { + editor = new ContenteditableEditor(targetEl); + } + if (!editor) { + throw new Error('unknown target element type'); + } + // yuku-t/textcomplete inherits directionality from target element itself + targetEl.setAttribute('dir', document.querySelector('html').getAttribute('data-dir')); + + var textcomplete = new Textcomplete(editor, strategies, { + dropdown: options, + }); + textcomplete.on('rendered', function () { + if (textcomplete.dropdown.items.length) { + // Activate the first item by default. + textcomplete.dropdown.items[0].activate(); + } + }); + + return textcomplete; + }; + + return autocomplete; }); diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index 0794af22a8..c48113d2f7 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -1,10 +1,9 @@ 'use strict'; define('chat', [ - 'components', 'taskbar', 'translator', 'hooks', 'bootbox', 'alerts', 'api', -], function (components, taskbar, translator, hooks, bootbox, alerts, api) { + 'components', 'taskbar', 'translator', 'hooks', 'bootbox', 'alerts', 'api', 'scrollStop', +], function (components, taskbar, translator, hooks, bootbox, alerts, api, scrollStop) { const module = {}; - let newMessage = false; module.openChat = function (roomId, uid) { if (!app.user.uid) { @@ -182,9 +181,11 @@ define('chat', [ return; } if (module.modalExists(data.roomId)) { + const modal = module.getModal(data.roomId); + const newMessage = parseInt(modal.attr('new-message'), 10) === 1; data.self = parseInt(app.user.uid, 10) === parseInt(data.fromUid, 10) ? 1 : 0; if (!newMessage) { - newMessage = data.self === 0; + modal.attr('new-message', data.self === 0 ? 1 : 0); } data.message.self = data.self; data.message.timestamp = Math.min(Date.now(), data.message.timestamp); @@ -290,11 +291,60 @@ define('chat', [ return $('#chat-modal-' + roomId).length !== 0; }; + module.initWidget = function (roomId, chatModal) { + require(['forum/chats', 'forum/chats/messages'], function (Chats, ChatsMessages) { + socket.emit('modules.chats.enter', roomId); + api.del(`/chats/${roomId}/state`, {}); + + chatModal.find('.timeago').timeago(); + chatModal.find('[data-bs-toggle="tooltip"]').tooltip({ + trigger: 'hover', container: '#content', + }); + ChatsMessages.wrapImagesInLinks(chatModal.find('[component="chat/messages"] .chat-content')); + + scrollStop.apply(chatModal.find('[component="chat/messages"] .chat-content')); + + chatModal.on('mousemove keypress click', function () { + if (parseInt(chatModal.attr('new-message'), 10) === 1) { + api.del(`/chats/${roomId}/state`, {}); + chatModal.removeAttr('new-message'); + } + }); + + Chats.addActionHandlers(chatModal.find('[component="chat/message/window"]'), roomId); + Chats.addSendHandlers(roomId, chatModal.find('.chat-input'), chatModal.find('[data-action="send"]')); + + Chats.createAutoComplete(roomId, chatModal.find('[component="chat/input"]')); + + Chats.addScrollHandler(roomId, app.user.uid, chatModal.find('[component="chat/message/content"]')); + Chats.addScrollBottomHandler(roomId, chatModal.find('[component="chat/message/content"]')); + Chats.addParentHandler(chatModal.find('[component="chat/message/content"]')); + Chats.addCharactersLeftHandler(chatModal); + Chats.addTextareaResizeHandler(chatModal); + Chats.addTypingHandler(chatModal, roomId); + Chats.addIPHandler(chatModal); + Chats.addTooltipHandler(chatModal); + Chats.addUploadHandler({ + dragDropAreaEl: chatModal.find('.modal-content'), + pasteEl: chatModal, + uploadFormEl: chatModal.find('[component="chat/upload"]'), + uploadBtnEl: chatModal.find('[component="chat/upload/button"]'), + inputEl: chatModal.find('[component="chat/input"]'), + }); + + ChatsMessages.addSocketListeners(); + + ChatsMessages.scrollToBottomAfterImageLoad(chatModal.find('.chat-content')); + + hooks.fire('action:chat.loaded', chatModal); + }); + }; + module.createModal = function (data, callback) { callback = callback || function () {}; require([ - 'scrollStop', 'forum/chats', 'forum/chats/messages', 'forum/chats/message-search', - ], function (scrollStop, Chats, ChatsMessages, messageSearch) { + 'forum/chats', 'forum/chats/messages', 'forum/chats/message-search', + ], function (Chats, ChatsMessages, messageSearch) { app.parseAndTranslate('chat', data, function (chatModal) { const roomId = data.roomId; if (module.modalExists(roomId)) { @@ -305,45 +355,19 @@ define('chat', [ chatModal.attr('id', 'chat-modal-' + roomId); chatModal.attr('data-roomid', roomId); - chatModal.attr('intervalId', 0); chatModal.attr('data-uuid', uuid); chatModal.css('position', 'fixed'); chatModal.appendTo($('body')); chatModal.find('.timeago').timeago(); chatModal.find('[data-bs-toggle="tooltip"]').tooltip({ trigger: 'hover', container: '#content' }); ChatsMessages.wrapImagesInLinks(chatModal.find('[component="chat/messages"] .chat-content')); - module.center(chatModal); - - app.loadJQueryUI(function () { - chatModal.find('.modal-content').resizable({ - handles: 'n, e, s, w, se', - minHeight: 250, - minWidth: 400, - }); - - chatModal.find('.modal-content').on('resize', function (event, ui) { - if (ui.originalSize.height === ui.size.height) { - return; - } - - chatModal.find('.modal-body').css('height', module.calculateChatListHeight(chatModal)); - }); - - chatModal.draggable({ - start: function () { - taskbar.updateActive(uuid); - chatModal.css({ bottom: 'auto', right: 'auto' }); - }, - stop: function () { - module.focusInput(chatModal); - }, - distance: 10, - handle: '.modal-header', - }); - }); scrollStop.apply(chatModal.find('[component="chat/messages"] .chat-content')); + module.center(chatModal); + + makeModalResizeableDraggable(chatModal, uuid); + chatModal.find('#chat-close-btn').on('click', function () { module.close(uuid); }); @@ -380,9 +404,9 @@ define('chat', [ }); chatModal.on('mousemove keypress click', function () { - if (newMessage) { + if (parseInt(chatModal.attr('new-message'), 10) === 1) { api.del(`/chats/${roomId}/state`, {}); - newMessage = false; + chatModal.removeAttr('new-message'); } }); @@ -433,6 +457,36 @@ define('chat', [ }); }; + function makeModalResizeableDraggable(chatModal, uuid) { + app.loadJQueryUI(function () { + chatModal.find('.modal-content').resizable({ + handles: 'n, e, s, w, se', + minHeight: 250, + minWidth: 400, + }); + + chatModal.find('.modal-content').on('resize', function (event, ui) { + if (ui.originalSize.height === ui.size.height) { + return; + } + + chatModal.find('.modal-body').css('height', module.calculateChatListHeight(chatModal)); + }); + + chatModal.draggable({ + start: function () { + taskbar.updateActive(uuid); + chatModal.css({ bottom: 'auto', right: 'auto' }); + }, + stop: function () { + module.focusInput(chatModal); + }, + distance: 10, + handle: '.modal-header', + }); + }); + } + module.focusInput = function (chatModal) { setTimeout(function () { chatModal.find('[component="chat/input"]').focus(); @@ -441,8 +495,6 @@ define('chat', [ module.close = function (uuid) { const chatModal = $('.chat-modal[data-uuid="' + uuid + '"]'); - clearInterval(chatModal.attr('intervalId')); - chatModal.attr('intervalId', 0); chatModal.remove(); chatModal.data('modal', null); taskbar.discard('chat', uuid); @@ -529,8 +581,6 @@ define('chat', [ const chatModal = $('.chat-modal[data-uuid="' + uuid + '"]'); chatModal.addClass('hide'); taskbar.minimize('chat', uuid); - clearInterval(chatModal.attr('intervalId')); - chatModal.attr('intervalId', 0); hooks.fire('action:chat.minimized', { uuid: uuid, modal: chatModal, diff --git a/public/src/modules/quickreply.js b/public/src/modules/quickreply.js index 55aea0b769..563ee486f8 100644 --- a/public/src/modules/quickreply.js +++ b/public/src/modules/quickreply.js @@ -1,13 +1,15 @@ 'use strict'; define('quickreply', [ - 'components', 'composer', 'composer/autocomplete', 'api', + 'components', 'autocomplete', 'api', 'alerts', 'uploadHelpers', 'mousetrap', 'storage', 'hooks', ], function ( - components, composer, autocomplete, api, + components, autocomplete, api, alerts, uploadHelpers, mousetrap, storage, hooks ) { - const QuickReply = {}; + const QuickReply = { + _active: {}, + }; QuickReply.init = function () { const element = components.get('topic/quickreply/text'); @@ -27,7 +29,7 @@ define('quickreply', [ destroyAutoComplete(); }); $(window).trigger('composer:autocomplete:init', data); - autocomplete._active.core_qr = autocomplete.setup(data); + QuickReply._active.core_qr = autocomplete.setup(data); mousetrap.bind('ctrl+return', (e) => { if (e.target === element.get(0)) { @@ -113,7 +115,7 @@ define('quickreply', [ e.preventDefault(); storage.removeItem(qrDraftId); const textEl = components.get('topic/quickreply/text'); - composer.newReply({ + hooks.fire('action:composer.post.new', { tid: ajaxify.data.tid, title: ajaxify.data.titleRaw, body: textEl.val(), @@ -123,9 +125,9 @@ define('quickreply', [ }; function destroyAutoComplete() { - if (autocomplete._active.core_qr) { - autocomplete._active.core_qr.destroy(); - autocomplete._active.core_qr = null; + if (QuickReply._active.core_qr) { + QuickReply._active.core_qr.destroy(); + QuickReply._active.core_qr = null; } } diff --git a/src/api/topics.js b/src/api/topics.js index 7a6cabf966..2cef69215d 100644 --- a/src/api/topics.js +++ b/src/api/topics.js @@ -4,9 +4,12 @@ const validator = require('validator'); const user = require('../user'); const topics = require('../topics'); +const categories = require('../categories'); const posts = require('../posts'); const meta = require('../meta'); const privileges = require('../privileges'); +const events = require('../events'); +const batch = require('../batch'); const apiHelpers = require('./helpers'); @@ -298,3 +301,48 @@ topicsAPI.bump = async (caller, { tid }) => { await topics.markAsUnreadForAll(tid); topics.pushUnreadCount(caller.uid); }; + +topicsAPI.move = async (caller, { tid, cid }) => { + const canMove = await privileges.categories.isAdminOrMod(cid, caller.uid); + if (!canMove) { + throw new Error('[[error:no-privileges]]'); + } + + const tids = Array.isArray(tid) ? tid : [tid]; + const uids = await user.getUidsFromSet('users:online', 0, -1); + const cids = [parseInt(cid, 10)]; + + await batch.processArray(tids, async (tids) => { + await Promise.all(tids.map(async (tid) => { + const canMove = await privileges.topics.isAdminOrMod(tid, caller.uid); + if (!canMove) { + throw new Error('[[error:no-privileges]]'); + } + const topicData = await topics.getTopicFields(tid, ['tid', 'cid', 'slug', 'deleted']); + if (!cids.includes(topicData.cid)) { + cids.push(topicData.cid); + } + await topics.tools.move(tid, { + cid, + uid: caller.uid, + }); + + const notifyUids = await privileges.categories.filterUids('topics:read', topicData.cid, uids); + socketHelpers.emitToUids('event:topic_moved', topicData, notifyUids); + if (!topicData.deleted) { + socketHelpers.sendNotificationToTopicOwner(tid, caller.uid, 'move', 'notifications:moved-your-topic'); + } + + await events.log({ + type: `topic-move`, + uid: caller.uid, + ip: caller.ip, + tid: tid, + fromCid: topicData.cid, + toCid: cid, + }); + })); + }, { batch: 10 }); + + await categories.onTopicsMoved(cids); +}; diff --git a/src/api/users.js b/src/api/users.js index c4f4add772..3897613342 100644 --- a/src/api/users.js +++ b/src/api/users.js @@ -188,7 +188,7 @@ usersAPI.follow = async function (caller, data) { bodyShort: `[[notifications:user-started-following-you, ${displayname}]]`, nid: `follow:${data.uid}:uid:${caller.uid}`, from: caller.uid, - path: `/uid/${data.uid}/followers`, + path: `/uid/${caller.uid}`, mergeId: 'notifications:user-started-following-you', }); if (!notifObj) { diff --git a/src/controllers/errors.js b/src/controllers/errors.js index 35e2617bb1..ba6e3842fd 100644 --- a/src/controllers/errors.js +++ b/src/controllers/errors.js @@ -101,9 +101,9 @@ exports.handleErrors = async function handleErrors(err, req, res, next) { // esl try { if (data.cases.hasOwnProperty(err.code)) { data.cases[err.code](err, req, res, defaultHandler); - } else if (err.message.startsWith('[[error:no-') && err.message !== '[[error:no-privileges]]') { + } else if (err.message && err.message.startsWith('[[error:no-') && err.message !== '[[error:no-privileges]]') { notFoundHandler(); - } else if (err.message.startsWith('Failed to lookup view')) { + } else if (err.message && err.message.startsWith('Failed to lookup view')) { notBuiltHandler(); } else { await defaultHandler(); diff --git a/src/controllers/index.js b/src/controllers/index.js index 2cf50a7785..299050e37d 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -219,20 +219,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/controllers/write/topics.js b/src/controllers/write/topics.js index b9691a8da5..700b08e21a 100644 --- a/src/controllers/write/topics.js +++ b/src/controllers/write/topics.js @@ -11,7 +11,11 @@ const uploadsController = require('../uploads'); const Topics = module.exports; Topics.get = async (req, res) => { - helpers.formatApiResponse(200, res, await api.topics.get(req, req.params)); + const topicData = await api.topics.get(req, req.params); + if (!topicData) { + return helpers.formatApiResponse(404, res, new Error('[[error:no-topic]]')); + } + helpers.formatApiResponse(200, res, topicData); }; Topics.create = async (req, res) => { @@ -207,3 +211,10 @@ Topics.bump = async (req, res) => { helpers.formatApiResponse(200, res); }; + +Topics.move = async (req, res) => { + const { cid } = req.body; + await api.topics.move(req, { cid, ...req.params }); + + helpers.formatApiResponse(200, res); +}; diff --git a/src/events.js b/src/events.js index 41e1f0d29b..d7938e3b5a 100644 --- a/src/events.js +++ b/src/events.js @@ -75,6 +75,7 @@ events.types = [ 'export:uploads', 'account-locked', 'getUsersCSV', + 'getGroupCSV', 'chat-room-deleted', // To add new types from plugins, just Array.push() to this array ]; 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/messaging/notifications.js b/src/messaging/notifications.js index 503382cf01..d939bc939b 100644 --- a/src/messaging/notifications.js +++ b/src/messaging/notifications.js @@ -1,6 +1,7 @@ 'use strict'; const winston = require('winston'); +const validator = require('validator'); const batch = require('../batch'); const db = require('../database'); @@ -8,6 +9,7 @@ const notifications = require('../notifications'); const user = require('../user'); const io = require('../socket.io'); const plugins = require('../plugins'); +const utils = require('../utils'); module.exports = function (Messaging) { Messaging.setUserNotificationSetting = async (uid, roomId, value) => { @@ -66,6 +68,13 @@ module.exports = function (Messaging) { // push unread count only for private rooms if (!isPublic) { const uids = await Messaging.getAllUidsInRoomFromSet(`chat:room:${roomId}:uids:online`); + unreadData.teaser = { + content: validator.escape( + String(utils.stripHTMLTags(utils.decodeHTMLEntities(messageObj.content))) + ), + user: messageObj.fromUser, + timestampISO: messageObj.timestampISO, + }; Messaging.pushUnreadCount(uids, unreadData); } diff --git a/src/notifications.js b/src/notifications.js index fdb9998248..20a6cd5f73 100644 --- a/src/notifications.js +++ b/src/notifications.js @@ -475,7 +475,7 @@ Notifications.merge = async function (notifications) { case 'notifications:user-posted-to': case 'notifications:user-flagged-post-in': case 'notifications:user-flagged-user': { - const usernames = _.uniq(set.map(notifObj => notifObj && notifObj.user && notifObj.user.username)); + const usernames = _.uniq(set.map(notifObj => notifObj && notifObj.user && notifObj.user.displayname)); const numUsers = usernames.length; const title = utils.decodeHTMLEntities(notifications[modifyIndex].topicTitle || ''); diff --git a/src/plugins/index.js b/src/plugins/index.js index f3a42aa01a..37980dd55c 100644 --- a/src/plugins/index.js +++ b/src/plugins/index.js @@ -155,6 +155,7 @@ Plugins.get = async function (id) { const url = `${nconf.get('registry') || 'https://packages.nodebb.org'}/api/v1/plugins/${id}`; const { response, body } = await request.get(url); if (!response.ok) { + console.log(response); throw new Error(`[[error:unable-to-load-plugin, ${id}]]`); } let normalised = await Plugins.normalise([body ? body.payload : {}]); @@ -171,6 +172,7 @@ Plugins.list = async function (matching) { try { const { response, body } = await request.get(url); if (!response.ok) { + console.log(response); throw new Error(`[[error:unable-to-load-plugins-from-nbbpm]]`); } return await Plugins.normalise(body); @@ -184,6 +186,7 @@ Plugins.listTrending = async () => { const url = `${nconf.get('registry') || 'https://packages.nodebb.org'}/api/v1/analytics/top/week`; const { response, body } = await request.get(url); if (!response.ok) { + console.log(response); throw new Error(`[[error:unable-to-load-trending-plugins]]`); } return body; diff --git a/src/posts/parse.js b/src/posts/parse.js index 4e16a111ad..93691e1f69 100644 --- a/src/posts/parse.js +++ b/src/posts/parse.js @@ -22,19 +22,16 @@ let sanitizeConfig = { ...sanitize.defaults.allowedAttributes, a: ['href', 'name', 'hreflang', 'media', 'rel', 'target', 'type'], img: ['alt', 'height', 'ismap', 'src', 'usemap', 'width', 'srcset'], - iframe: ['height', 'name', 'src', 'width'], + iframe: ['height', 'name', 'src', 'width', 'allow', 'frameborder'], video: ['autoplay', 'playsinline', 'controls', 'height', 'loop', 'muted', 'poster', 'preload', 'src', 'width'], audio: ['autoplay', 'controls', 'loop', 'muted', 'preload', 'src'], source: ['type', 'src', 'srcset', 'sizes', 'media', 'height', 'width'], embed: ['height', 'src', 'type', 'width'], }, - globalAttributes: ['accesskey', 'class', 'contenteditable', 'dir', + nonBooleanAttributes: ['accesskey', 'class', 'contenteditable', 'dir', 'draggable', 'dropzone', 'hidden', 'id', 'lang', 'spellcheck', 'style', - 'tabindex', 'title', 'translate', 'aria-expanded', 'data-*', + 'tabindex', 'title', 'translate', 'aria-*', 'data-*', ], - allowedClasses: { - ...sanitize.defaults.allowedClasses, - }, }; module.exports = function (Posts) { @@ -122,7 +119,7 @@ module.exports = function (Posts) { sanitizeConfig.allowedTags.forEach((tag) => { sanitizeConfig.allowedAttributes[tag] = _.union( sanitizeConfig.allowedAttributes[tag], - sanitizeConfig.globalAttributes + sanitizeConfig.nonBooleanAttributes ); }); diff --git a/src/routes/write/topics.js b/src/routes/write/topics.js index 1a537fd56d..df10f66633 100644 --- a/src/routes/write/topics.js +++ b/src/routes/write/topics.js @@ -49,5 +49,7 @@ module.exports = function () { setupApiRoute(router, 'delete', '/:tid/read', [...middlewares, middleware.assert.topic], controllers.write.topics.markUnread); setupApiRoute(router, 'put', '/:tid/bump', [...middlewares, middleware.assert.topic], controllers.write.topics.bump); + setupApiRoute(router, 'put', '/:tid/move', [...middlewares, middleware.assert.topic], controllers.write.topics.move); + return router; }; diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js index f150102f13..0e59e93849 100644 --- a/src/socket.io/meta.js +++ b/src/socket.io/meta.js @@ -5,6 +5,7 @@ const os = require('os'); const user = require('../user'); const meta = require('../meta'); const topics = require('../topics'); +const privileges = require('../privileges'); const SocketMeta = module.exports; SocketMeta.rooms = {}; @@ -44,6 +45,20 @@ SocketMeta.rooms.enter = async function (socket, data) { throw new Error('[[error:not-allowed]]'); } + if (data.enter && data.enter.startsWith('topic_')) { + const tid = data.enter.split('_').pop(); + if (!await privileges.topics.can('topics:read', tid, socket.uid)) { + throw new Error('[[error:no-privileges]]'); + } + } + + if (data.enter && data.enter.startsWith('category_')) { + const cid = data.enter.split('_').pop(); + if (!await privileges.categories.can('read', cid, socket.uid)) { + throw new Error('[[error:no-privileges]]'); + } + } + leaveCurrentRoom(socket); if (data.enter) { diff --git a/src/socket.io/topics/move.js b/src/socket.io/topics/move.js index 6c03412cc2..edda6b2c77 100644 --- a/src/socket.io/topics/move.js +++ b/src/socket.io/topics/move.js @@ -1,55 +1,26 @@ 'use strict'; const async = require('async'); -const user = require('../../user'); const topics = require('../../topics'); const categories = require('../../categories'); const privileges = require('../../privileges'); -const socketHelpers = require('../helpers'); const events = require('../../events'); +const api = require('../../api'); +const sockets = require('..'); + module.exports = function (SocketTopics) { SocketTopics.move = async function (socket, data) { + sockets.warnDeprecated(socket, 'GET /api/v3/topics/:tid/move'); + if (!data || !Array.isArray(data.tids) || !data.cid) { throw new Error('[[error:invalid-data]]'); } - const canMove = await privileges.categories.isAdminOrMod(data.cid, socket.uid); - if (!canMove) { - throw new Error('[[error:no-privileges]]'); - } - - const uids = await user.getUidsFromSet('users:online', 0, -1); - const cids = [parseInt(data.cid, 10)]; - await async.eachLimit(data.tids, 10, async (tid) => { - const canMove = await privileges.topics.isAdminOrMod(tid, socket.uid); - if (!canMove) { - throw new Error('[[error:no-privileges]]'); - } - const topicData = await topics.getTopicFields(tid, ['tid', 'cid', 'slug', 'deleted']); - if (!cids.includes(topicData.cid)) { - cids.push(topicData.cid); - } - data.uid = socket.uid; - await topics.tools.move(tid, data); - - const notifyUids = await privileges.categories.filterUids('topics:read', topicData.cid, uids); - socketHelpers.emitToUids('event:topic_moved', topicData, notifyUids); - if (!topicData.deleted) { - socketHelpers.sendNotificationToTopicOwner(tid, socket.uid, 'move', 'notifications:moved-your-topic'); - } - - await events.log({ - type: `topic-move`, - uid: socket.uid, - ip: socket.ip, - tid: tid, - fromCid: topicData.cid, - toCid: data.cid, - }); + await api.topics.move(socket, { + tid: data.tids, + cid: data.cid, }); - - await categories.onTopicsMoved(cids); }; diff --git a/src/topics/scheduled.js b/src/topics/scheduled.js index 0a91067d59..5b98bea84f 100644 --- a/src/topics/scheduled.js +++ b/src/topics/scheduled.js @@ -8,8 +8,10 @@ const db = require('../database'); const posts = require('../posts'); const socketHelpers = require('../socket.io/helpers'); const topics = require('./index'); +const categories = require('../categories'); const groups = require('../groups'); const user = require('../user'); +const plugins = require('../plugins'); const Scheduled = module.exports; @@ -117,13 +119,21 @@ async function sendNotifications(uids, topicsData) { } }); - return Promise.all(topicsData.map( + await Promise.all(topicsData.map( (t, idx) => user.notifications.sendTopicNotificationToFollowers(t.uid, t, postsData[idx]) + ).concat( + postsData.map(p => topics.notifyTagFollowers(p, p.uid)) + ).concat( + postsData.map(p => categories.notifyCategoryFollowers(p, p.uid)) ).concat( topicsData.map( (t, idx) => socketHelpers.notifyNew(t.uid, 'newTopic', { posts: [postsData[idx]], topic: t }) ) )); + plugins.hooks.fire('action:topics.scheduled.notify', { + posts: postsData, + topics: topicsData, + }); } async function updateUserLastposttimes(uids, topicsData) { diff --git a/src/topics/tags.js b/src/topics/tags.js index daab4e5f77..2cc8be1ffa 100644 --- a/src/topics/tags.js +++ b/src/topics/tags.js @@ -609,13 +609,13 @@ module.exports = function (Topics) { const { displayname } = postData.user; const notifBase = 'notifications:user-posted-topic-with-tag'; - let bodyShort = translator.compile(notifBase, displayname, tags[0]); + let bodyShort = translator.compile(notifBase, displayname, postData.topic.title, tags[0]); if (tags.length === 2) { - bodyShort = translator.compile(`${notifBase}-dual`, displayname, tags[0], tags[1]); + bodyShort = translator.compile(`${notifBase}-dual`, displayname, postData.topic.title, tags[0], tags[1]); } else if (tags.length === 3) { - bodyShort = translator.compile(`${notifBase}-triple`, displayname, tags[0], tags[1], tags[2]); + bodyShort = translator.compile(`${notifBase}-triple`, displayname, postData.topic.title, tags[0], tags[1], tags[2]); } else if (tags.length > 3) { - bodyShort = translator.compile(`${notifBase}-multiple`, displayname, tags.join(', ')); + bodyShort = translator.compile(`${notifBase}-multiple`, displayname, postData.topic.title, tags.join(', ')); } const notification = await notifications.create({ diff --git a/src/user/admin.js b/src/user/admin.js index 369aafee50..35598bbbd9 100644 --- a/src/user/admin.js +++ b/src/user/admin.js @@ -64,7 +64,7 @@ module.exports = function (User) { 'w' ); fs.promises.appendFile(fd, `${fields.map(f => `"${f}"`).join(',')}\n`); - await batch.processSortedSet('group:administrators:members', async (uids) => { + await batch.processSortedSet('users:joindate', async (uids) => { const userFieldsToLoad = fields.filter(field => field !== 'ip' && field !== 'password'); const usersData = await User.getUsersFields(uids, userFieldsToLoad); let userIps = []; diff --git a/src/user/approval.js b/src/user/approval.js index 5e0f1153c0..5067239d8a 100644 --- a/src/user/approval.js +++ b/src/user/approval.js @@ -14,8 +14,12 @@ const slugify = require('../slugify'); const plugins = require('../plugins'); module.exports = function (User) { - new cronJob('0 * * * *', (() => { - User.autoApprove(); + new cronJob('0 * * * *', (async () => { + try { + await User.autoApprove(); + } catch (err) { + winston.error(err.stack); + } }), null, true); User.addToApprovalQueue = async function (userData) { @@ -160,8 +164,14 @@ module.exports = function (User) { const users = await db.getSortedSetRevRangeWithScores('registration:queue', 0, -1); const now = Date.now(); for (const user of users.filter(user => now - user.score >= meta.config.autoApproveTime * 3600000)) { - // eslint-disable-next-line no-await-in-loop - await User.acceptRegistration(user.value); + try { + // eslint-disable-next-line no-await-in-loop + await User.acceptRegistration(user.value); + } catch (err) { + winston.error(err.stack); + // eslint-disable-next-line no-await-in-loop + await removeFromQueue(user.value); + } } }; }; diff --git a/src/user/profile.js b/src/user/profile.js index 9d65037bbe..e9c751e40f 100644 --- a/src/user/profile.js +++ b/src/user/profile.js @@ -317,6 +317,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/admin/advanced/hooks.tpl b/src/views/admin/advanced/hooks.tpl index 61aaa26ebc..fceffc3655 100644 --- a/src/views/admin/advanced/hooks.tpl +++ b/src/views/admin/advanced/hooks.tpl @@ -4,7 +4,7 @@
    {hooks.hookName} - +
    diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl index 5a7f86d86d..0496bab2cd 100644 --- a/src/views/admin/extend/widgets.tpl +++ b/src/views/admin/extend/widgets.tpl @@ -21,13 +21,13 @@
    - - + +
    -
    +
    {{{ each templates }}}
    @@ -43,7 +43,7 @@ {{{ end }}}
    -
    +
    @@ -115,11 +115,21 @@
    [[admin/extend/widgets:container.jumbotron]]
    + +
    +
    [[admin/extend/widgets:container.title]]
    +
    +
    + [[admin/extend/widgets:container.body]] +
    +
    +
    [[admin/extend/widgets:container.card]]
    +
    [[admin/extend/widgets:container.card-header]] diff --git a/src/views/admin/manage/admins-mods.tpl b/src/views/admin/manage/admins-mods.tpl index 977c59275d..6375ea923e 100644 --- a/src/views/admin/manage/admins-mods.tpl +++ b/src/views/admin/manage/admins-mods.tpl @@ -15,7 +15,7 @@
    {buildAvatar(admins.members, "24px", true)} {admins.members.username} -
    @@ -35,7 +35,7 @@
    {buildAvatar(globalMods.members, "24px", true)} {globalMods.members.username} -
    @@ -87,7 +87,7 @@
    {buildAvatar(categoryMods.moderators, "24px", true)} {categoryMods.moderators.username} -
    diff --git a/src/views/admin/manage/categories.tpl b/src/views/admin/manage/categories.tpl index 512105dbac..bed5850325 100644 --- a/src/views/admin/manage/categories.tpl +++ b/src/views/admin/manage/categories.tpl @@ -4,7 +4,7 @@

    [[admin/manage/categories:manage-categories]]

    - + diff --git a/src/views/admin/manage/category.tpl b/src/views/admin/manage/category.tpl index fb2afcedec..9f2ebbe2c3 100644 --- a/src/views/admin/manage/category.tpl +++ b/src/views/admin/manage/category.tpl @@ -166,27 +166,27 @@
    - [[admin/manage/categories:back-to-categories]] + [[admin/manage/categories:back-to-categories]]
    - - [[admin/manage/categories:analytics]] + [[admin/manage/categories:analytics]] - + [[admin/manage/categories:privileges]] - + [[admin/manage/categories:view-category]]
    - - diff --git a/src/views/admin/manage/group.tpl b/src/views/admin/manage/group.tpl index e8ce44d981..114d5e8692 100644 --- a/src/views/admin/manage/group.tpl +++ b/src/views/admin/manage/group.tpl @@ -6,7 +6,7 @@

    [[admin/manage/groups:edit-group]]

    -