diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 86dc5c50d3..01ca27e133 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -21,13 +21,13 @@ jobs: fetch-depth: 0 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -43,7 +43,7 @@ jobs: type=raw,value=latest - name: Build and push Docker images - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . file: ./Dockerfile diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 49e67166d5..225615aa72 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -57,7 +57,7 @@ jobs: - 5432:5432 redis: - image: 'redis:2.8.9' + image: 'redis:2.8.23' # Set health checks to wait until redis has started options: >- --health-cmd "redis-cli ping" @@ -69,7 +69,7 @@ jobs: - 6379:6379 mongo: - image: 'mongo:3.6' + image: 'mongo:3.7' ports: # Maps port 27017 on service container to the host - 27017:27017 diff --git a/CHANGELOG.md b/CHANGELOG.md index 37ac7ed189..425a480f12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +#### v2.4.5 (2022-08-22) + +##### Chores + +* incrementing version number - v2.4.4 (d5525c87) +* update changelog for v2.4.4 (77e492b8) +* incrementing version number - v2.4.3 (9c647c6c) +* incrementing version number - v2.4.2 (3aa7b855) +* incrementing version number - v2.4.1 (60cbd148) +* incrementing version number - v2.4.0 (4834cde3) +* incrementing version number - v2.3.1 (d2425942) +* incrementing version number - v2.3.0 (046ea120) + +##### Bug Fixes + +* wrap passport.authenticate to pass in keepSessionInfo if not already set (9b96c33d) +* parseInt caller.uid closes #10849 (bc37a5c5) + #### v2.4.4 (2022-08-18) ##### Chores diff --git a/install/data/defaults.json b/install/data/defaults.json index 3f0e428fce..f3859d2d0c 100644 --- a/install/data/defaults.json +++ b/install/data/defaults.json @@ -78,6 +78,7 @@ "reputation:disabled": 0, "downvote:disabled": 0, "disableSignatures": 0, + "signatures:hideDuplicates": 0, "upvotesPerDay": 20, "upvotesPerUserPerDay": 6, "downvotesPerDay": 10, @@ -93,6 +94,8 @@ "min:rep:signature": 0, "flags:limitPerTarget": 0, "flags:autoFlagOnDownvoteThreshold": 0, + "flags:actionOnResolve": "rescind", + "flags:actionOnReject": "rescind", "notificationType_upvote": "notification", "notificationType_new-topic": "notification", "notificationType_new-reply": "notification", diff --git a/install/package.json b/install/package.json index 58760a2909..79e284308a 100644 --- a/install/package.json +++ b/install/package.json @@ -29,8 +29,8 @@ }, "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", - "@isaacs/ttlcache": "^1.2.0", - "ace-builds": "1.8.1", + "@isaacs/ttlcache": "1.2.0", + "ace-builds": "1.9.5", "archiver": "5.3.1", "async": "3.2.4", "autoprefixer": "10.4.8", @@ -45,7 +45,7 @@ "clipboard": "2.0.11", "colors": "1.4.0", "commander": "9.4.0", - "compare-versions": "4.1.3", + "compare-versions": "4.1.4", "compression": "1.7.4", "connect-flash": "0.1.1", "connect-mongo": "4.6.0", @@ -78,18 +78,18 @@ "less": "4.1.3", "lodash": "4.17.21", "logrotate-stream": "0.2.8", - "lru-cache": "7.13.1", + "lru-cache": "7.14.0", "material-design-lite": "1.3.0", "mime": "3.0.0", "mkdirp": "1.0.4", - "mongodb": "4.8.1", + "mongodb": "4.9.0", "morgan": "1.10.0", "mousetrap": "1.6.5", "multiparty": "4.2.3", "@nodebb/bootswatch": "3.4.2", "nconf": "0.12.0", "nodebb-plugin-2factor": "5.0.2", - "nodebb-plugin-composer-default": "8.0.0", + "nodebb-plugin-composer-default": "9.1.0", "nodebb-plugin-dbsearch": "5.1.5", "nodebb-plugin-emoji": "4.0.4", "nodebb-plugin-emoji-android": "3.0.0", @@ -98,11 +98,11 @@ "nodebb-plugin-spam-be-gone": "1.0.0", "nodebb-rewards-essentials": "0.2.1", "nodebb-theme-lavender": "6.0.0", - "nodebb-theme-persona": "12.1.0", + "nodebb-theme-persona": "12.1.1", "nodebb-theme-slick": "2.0.2", "nodebb-theme-vanilla": "12.1.18", "nodebb-widget-essentials": "6.0.0", - "nodemailer": "6.7.7", + "nodemailer": "6.7.8", "nprogress": "0.2.0", "passport": "0.6.0", "passport-http-bearer": "1.0.1", @@ -129,14 +129,11 @@ "sortablejs": "1.15.0", "spdx-license-list": "6.6.0", "spider-detector": "2.0.0", - "textcomplete": "0.18.2", - "textcomplete.contenteditable": "0.1.1", "timeago": "1.6.7", "tinycon": "0.6.8", "toobusy-js": "0.5.1", "uglify-es": "3.3.9", "validator": "13.7.0", - "visibilityjs": "2.0.2", "webpack": "5.74.0", "webpack-merge": "5.8.0", "winston": "3.8.1", @@ -150,7 +147,7 @@ "@commitlint/cli": "17.0.3", "@commitlint/config-angular": "17.0.3", "coveralls": "3.1.1", - "eslint": "8.21.0", + "eslint": "8.22.0", "eslint-config-nodebb": "0.1.1", "eslint-plugin-import": "2.26.0", "grunt": "1.5.3", @@ -187,4 +184,4 @@ "url": "https://github.com/barisusakli" } ] -} \ No newline at end of file +} diff --git a/public/language/ar/admin/advanced/cache.json b/public/language/ar/admin/advanced/cache.json index ff03a9e430..77ff9a4387 100644 --- a/public/language/ar/admin/advanced/cache.json +++ b/public/language/ar/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "التخزين المؤقت للمشاركات", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "1% كاملة", "post-cache-size": "حجم التخزين المؤقت للمشاركات", "items-in-cache": "العناصر في التخزين المؤقت" diff --git a/public/language/ar/admin/settings/post.json b/public/language/ar/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/ar/admin/settings/post.json +++ b/public/language/ar/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/ar/admin/settings/reputation.json b/public/language/ar/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/ar/admin/settings/reputation.json +++ b/public/language/ar/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/bg/admin/advanced/cache.json b/public/language/bg/admin/advanced/cache.json index 54e6983f5a..d4627e3e30 100644 --- a/public/language/bg/admin/advanced/cache.json +++ b/public/language/bg/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Кеш за публикации", + "group-cache": "Кеш за групи", + "local-cache": "Локален кеш", + "object-cache": "Кеш за обекти", "percent-full": "Запълненост: %1%", "post-cache-size": "Размер на кеша за публикации", "items-in-cache": "Елементи в кеша" diff --git a/public/language/bg/admin/settings/post.json b/public/language/bg/admin/settings/post.json index 3844182199..d474d24ac8 100644 --- a/public/language/bg/admin/settings/post.json +++ b/public/language/bg/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Забраняване на подписите", "signature.no-links": "Забраняване на поставянето на връзки в подписите", "signature.no-images": "Забраняване на поставянето на изображения в подписите", + "signature.hide-duplicates": "Скриване на дублираните подписи в темите", "signature.max-length": "Максимална дължина на подписите", "composer": "Настройки за съставянето", "composer-help": "Следващите настройки определят функционалностите и/или вида на елемента за съставяне на\n\\t\\t\\t\\tпубликация, който се използва от потребителите, когато те създават нови теми или отговорят в съществуващи.", diff --git a/public/language/bg/admin/settings/reputation.json b/public/language/bg/admin/settings/reputation.json index e5f4fb72bc..9601b9d0f4 100644 --- a/public/language/bg/admin/settings/reputation.json +++ b/public/language/bg/admin/settings/reputation.json @@ -23,5 +23,9 @@ "flags.limit-per-target-placeholder": "По подразбиране: 0", "flags.limit-per-target-help": "Когато публикация или потребител бъде докладван няколко пъти, това се добавя към един общ доклад. Задайте на тази настройка стойност по-голяма от нула, за да ограничите броя на докладванията, които могат да бъдат натрупани към една публикация или потребител.", "flags.auto-flag-on-downvote-threshold": "Брой отрицателни гласове, при които публикациите да бъдат докладвани автоматично (0 = изключено, по подразбиране: 0)", - "flags.auto-resolve-on-ban": "Автоматично премахване на всички доклади за потребител, когато той бъде блокиран" + "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/bn/admin/advanced/cache.json b/public/language/bn/admin/advanced/cache.json index 2fd7984883..0148c2d889 100644 --- a/public/language/bn/admin/advanced/cache.json +++ b/public/language/bn/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Post Cache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Full", "post-cache-size": "Post Cache Size", "items-in-cache": "Items in Cache" diff --git a/public/language/bn/admin/settings/post.json b/public/language/bn/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/bn/admin/settings/post.json +++ b/public/language/bn/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/bn/admin/settings/reputation.json b/public/language/bn/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/bn/admin/settings/reputation.json +++ b/public/language/bn/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/cs/admin/advanced/cache.json b/public/language/cs/admin/advanced/cache.json index 27fc2042e6..193dd5c2f0 100644 --- a/public/language/cs/admin/advanced/cache.json +++ b/public/language/cs/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Mezipaměť příspěvku", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% plný", "post-cache-size": "Velikost mezipaměti příspěvku", "items-in-cache": "Položek v mezipaměti" diff --git a/public/language/cs/admin/settings/post.json b/public/language/cs/admin/settings/post.json index eb89abb569..e2c471d925 100644 --- a/public/language/cs/admin/settings/post.json +++ b/public/language/cs/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Zakázat podpisy", "signature.no-links": "Zakázat odkazy v podpisech", "signature.no-images": "Zakázat obrázky v podpisech", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximální délka podpisu", "composer": "Nastavení kompozice", "composer-help": "Následující nastavení kontroluje funkčnost a/nebo vzhled zobrazených příspěvků\n\t\t\t\tpro uživatele, kteří vytvoří nové téma nebo odpovídají na existující téma.", diff --git a/public/language/cs/admin/settings/reputation.json b/public/language/cs/admin/settings/reputation.json index ca92da31a2..b59d134bcf 100644 --- a/public/language/cs/admin/settings/reputation.json +++ b/public/language/cs/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/da/admin/advanced/cache.json b/public/language/da/admin/advanced/cache.json index 6f4512e562..ff4a3382b0 100644 --- a/public/language/da/admin/advanced/cache.json +++ b/public/language/da/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Indlægs Cache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Fuld", "post-cache-size": "Indlægs Cache Størrelse", "items-in-cache": "Ting i Cache" diff --git a/public/language/da/admin/settings/post.json b/public/language/da/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/da/admin/settings/post.json +++ b/public/language/da/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/da/admin/settings/reputation.json b/public/language/da/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/da/admin/settings/reputation.json +++ b/public/language/da/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/de/admin/advanced/cache.json b/public/language/de/admin/advanced/cache.json index ae8d88c8b7..e5c0e8fdfd 100644 --- a/public/language/de/admin/advanced/cache.json +++ b/public/language/de/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Post-Cache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Voll", "post-cache-size": "Post-Cache-Größe", "items-in-cache": "Elemente im Cache" diff --git a/public/language/de/admin/settings/post.json b/public/language/de/admin/settings/post.json index b84a943130..33d1885e40 100644 --- a/public/language/de/admin/settings/post.json +++ b/public/language/de/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Signaturen deaktivieren", "signature.no-links": "Links in signaturen deaktivieren", "signature.no-images": "Bilder in Signaturen deaktivieren", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximale Signaturlänge", "composer": "Editor Einstellungen", "composer-help": "Die folgenden Einstellungen bestimmen die funktionalität und/oder das Aussehen des Beitragseditors, der Nutzern angezeigt wird, webb sie neue Themen erstellen, oder bereits existierenden Antworten.", diff --git a/public/language/de/admin/settings/reputation.json b/public/language/de/admin/settings/reputation.json index 106965c7a3..d7b7585c7b 100644 --- a/public/language/de/admin/settings/reputation.json +++ b/public/language/de/admin/settings/reputation.json @@ -23,5 +23,9 @@ "flags.limit-per-target-placeholder": "Standardwert: 0", "flags.limit-per-target-help": "Wenn ein Beitrag oder ein Benutzer mehrfach markiert wird, wird jede zusätzliche Markierung als "Nachricht" betrachtet und zur ursprünglichen Markierung hinzugezählt. Setzen Sie diese Option auf eine andere Zahl als Null, um die Anzahl der Nachricht, die ein Artikel erhalten kann, zu begrenzen.", "flags.auto-flag-on-downvote-threshold": "Anzahl der Downvotes für Posts mit automatischer Markierung (zum Deaktivieren auf 0 setzen, Standard: 0)", - "flags.auto-resolve-on-ban": "Automatisches Beenden aller Tickets eines Benutzers, wenn dieser gesperrt wird" + "flags.auto-resolve-on-ban": "Automatisches Beenden aller Tickets eines Benutzers, wenn dieser gesperrt wird", + "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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/el/admin/advanced/cache.json b/public/language/el/admin/advanced/cache.json index 5d06a37508..4a2c76fc94 100644 --- a/public/language/el/admin/advanced/cache.json +++ b/public/language/el/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Προσωρινή μνήμη ανάρτησης", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Πλήρες", "post-cache-size": "Μέγεθος προσωρινής μνήμης ανάρτησης", "items-in-cache": "Αντικείμενα στην προσωρινή μνήμη" diff --git a/public/language/el/admin/settings/post.json b/public/language/el/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/el/admin/settings/post.json +++ b/public/language/el/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/el/admin/settings/reputation.json b/public/language/el/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/el/admin/settings/reputation.json +++ b/public/language/el/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/en-GB/admin/advanced/cache.json b/public/language/en-GB/admin/advanced/cache.json index 2fd7984883..0148c2d889 100644 --- a/public/language/en-GB/admin/advanced/cache.json +++ b/public/language/en-GB/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Post Cache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Full", "post-cache-size": "Post Cache Size", "items-in-cache": "Items in Cache" diff --git a/public/language/en-GB/admin/settings/post.json b/public/language/en-GB/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/en-GB/admin/settings/post.json +++ b/public/language/en-GB/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/en-GB/admin/settings/reputation.json b/public/language/en-GB/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/en-GB/admin/settings/reputation.json +++ b/public/language/en-GB/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/en-US/admin/advanced/cache.json b/public/language/en-US/admin/advanced/cache.json index 2fd7984883..0148c2d889 100644 --- a/public/language/en-US/admin/advanced/cache.json +++ b/public/language/en-US/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Post Cache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Full", "post-cache-size": "Post Cache Size", "items-in-cache": "Items in Cache" diff --git a/public/language/en-US/admin/settings/post.json b/public/language/en-US/admin/settings/post.json index b4d89f389a..14e7cb12a3 100644 --- a/public/language/en-US/admin/settings/post.json +++ b/public/language/en-US/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\\t\\t\\t\\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/en-US/admin/settings/reputation.json b/public/language/en-US/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/en-US/admin/settings/reputation.json +++ b/public/language/en-US/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/en-x-pirate/admin/advanced/cache.json b/public/language/en-x-pirate/admin/advanced/cache.json index 2fd7984883..0148c2d889 100644 --- a/public/language/en-x-pirate/admin/advanced/cache.json +++ b/public/language/en-x-pirate/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Post Cache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Full", "post-cache-size": "Post Cache Size", "items-in-cache": "Items in Cache" diff --git a/public/language/en-x-pirate/admin/settings/post.json b/public/language/en-x-pirate/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/en-x-pirate/admin/settings/post.json +++ b/public/language/en-x-pirate/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/en-x-pirate/admin/settings/reputation.json b/public/language/en-x-pirate/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/en-x-pirate/admin/settings/reputation.json +++ b/public/language/en-x-pirate/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/es/admin/advanced/cache.json b/public/language/es/admin/advanced/cache.json index 6390513a64..be68806428 100644 --- a/public/language/es/admin/advanced/cache.json +++ b/public/language/es/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Publicar Cache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Completo", "post-cache-size": "Tamaño de cache del post", "items-in-cache": "Artículos en cache" diff --git a/public/language/es/admin/settings/post.json b/public/language/es/admin/settings/post.json index eec90ff156..c6f532b019 100644 --- a/public/language/es/admin/settings/post.json +++ b/public/language/es/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Desactivar firmas", "signature.no-links": "Desactivar enlaces en firmas", "signature.no-images": "Desactivar imágenes en firmas", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Longitud Máxima de Firma", "composer": "Configuración del Editor de Texto", "composer-help": "LAs configuraciones siguientes gobiernan la funcionalidad y/o apariencia del editor de entradas mostrado\n\t\t\t\ta los usuarios cuando crean nuevos temas, o responden a temas existentes.", diff --git a/public/language/es/admin/settings/reputation.json b/public/language/es/admin/settings/reputation.json index c9c487f8de..acf5eb5ebd 100644 --- a/public/language/es/admin/settings/reputation.json +++ b/public/language/es/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/et/admin/advanced/cache.json b/public/language/et/admin/advanced/cache.json index 8b90a4b431..f132ef4845 100644 --- a/public/language/et/admin/advanced/cache.json +++ b/public/language/et/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Postituste vahemälu", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Täis", "post-cache-size": "Postituse vahemälu suurus", "items-in-cache": "Esemed vahemälus" diff --git a/public/language/et/admin/settings/post.json b/public/language/et/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/et/admin/settings/post.json +++ b/public/language/et/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/et/admin/settings/reputation.json b/public/language/et/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/et/admin/settings/reputation.json +++ b/public/language/et/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ 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 d85c528aae..7e2280f2bb 100644 --- a/public/language/fa-IR/admin/advanced/cache.json +++ b/public/language/fa-IR/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "کش دیدگاه ", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% تمام شده", "post-cache-size": "سایز کش دیدگاه", "items-in-cache": "موارد موجود در کش" diff --git a/public/language/fa-IR/admin/settings/post.json b/public/language/fa-IR/admin/settings/post.json index d07c92aa9d..786f361ffc 100644 --- a/public/language/fa-IR/admin/settings/post.json +++ b/public/language/fa-IR/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/fa-IR/admin/settings/reputation.json b/public/language/fa-IR/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/fa-IR/admin/settings/reputation.json +++ b/public/language/fa-IR/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/fi/admin/advanced/cache.json b/public/language/fi/admin/advanced/cache.json index 629720debf..54a656b600 100644 --- a/public/language/fi/admin/advanced/cache.json +++ b/public/language/fi/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Viestivälimuisti", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Täynnä", "post-cache-size": "Viestivälimuistin koko", "items-in-cache": "Asioita välimuistissa" diff --git a/public/language/fi/admin/settings/post.json b/public/language/fi/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/fi/admin/settings/post.json +++ b/public/language/fi/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/fi/admin/settings/reputation.json b/public/language/fi/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/fi/admin/settings/reputation.json +++ b/public/language/fi/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/fr/admin/advanced/cache.json b/public/language/fr/admin/advanced/cache.json index dacc862d51..130034e50e 100644 --- a/public/language/fr/admin/advanced/cache.json +++ b/public/language/fr/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Cache des messages", + "group-cache": "Cache de groupe", + "local-cache": "Cache Local", + "object-cache": "Cache d'objets", "percent-full": "Plein à %1%", "post-cache-size": "Taille du cache des messages", "items-in-cache": "Objets en cache" diff --git a/public/language/fr/admin/menu.json b/public/language/fr/admin/menu.json index e5f477dc00..c24c461f4e 100644 --- a/public/language/fr/admin/menu.json +++ b/public/language/fr/admin/menu.json @@ -76,7 +76,7 @@ "logout": "Déconnexion ", "view-forum": "Voir le forum", - "search.placeholder": "Search settings", + "search.placeholder": "Paramètres de recherche", "search.no-results": "Aucun résultat…", "search.search-forum": "Rechercher dans le forum", "search.keep-typing": "Continuez de taper pour afficher les résultats…", diff --git a/public/language/fr/admin/settings/email.json b/public/language/fr/admin/settings/email.json index 9ec14a9f3f..3d3a4b8f4f 100644 --- a/public/language/fr/admin/settings/email.json +++ b/public/language/fr/admin/settings/email.json @@ -10,10 +10,10 @@ "smtp-transport-help": "Vous pouvez sélectionner depuis une liste de services ou entrer un service personnalisé.", "smtp-transport.service": "Sélectionner un service", "smtp-transport.service-custom": "Service personnalisé", - "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select "Custom Service" and enter the details below.", - "smtp-transport.gmail-warning1": "If you are using GMail as your email provider, you will have to generate an "App Password" in order for NodeBB to authenticate successfully. You can generate one at the App Passwords page.", - "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "smtp-transport.auto-enable-toast": "It looks like you're configuring an SMTP transport. We enabled the \"SMTP Transport\" option for you.", + "smtp-transport.service-help": "Sélectionnez un nom de service ci-dessus afin d'utiliser les informations connues à son sujet. Vous pouvez également sélectionner "Service personnalisé" et entrez les détails ci-dessous.", + "smtp-transport.gmail-warning1": "Si vous utilisez GMail comme fournisseur de messagerie, vous devrez générer un "mot de passe d'application" afin que NodeBB s'authentifie avec succès. Vous pouvez en générer un sur la page Mots de passe .", + "smtp-transport.gmail-warning2": "Pour plus d'informations sur cette solution de contournement, veuillez consulter cet article de NodeMailer sur le problème. Une alternative serait d'utiliser un plug-in tiers d'e-mail tel que SendGrid, Mailgun, etc. Parcourez les plug-ins disponibles ici.", + "smtp-transport.auto-enable-toast": "Il semble que vous configuriez un serveur SMTP. Nous avons activé l'option \" SMTP\" pour vous.", "smtp-transport.host": "Host SMTP", "smtp-transport.port": "Port SMTP", "smtp-transport.security": "Accès sécurisé", diff --git a/public/language/fr/admin/settings/post.json b/public/language/fr/admin/settings/post.json index 9a546492b1..9546189788 100644 --- a/public/language/fr/admin/settings/post.json +++ b/public/language/fr/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Désactiver les signatures", "signature.no-links": "Désactiver les liens en signature", "signature.no-images": "Désactiver les images en signature ", + "signature.hide-duplicates": "Masquer les signatures en double dans les sujets", "signature.max-length": "Longueur maximum des signatures", "composer": "Paramètres Composer", "composer-help": "Les réglages suivants permettent de choisir les fonctionnalités et/ou l'apparence du composeur de message affiché\n\t\t\t\ttaux utilisateurs quand ils créent de nouveaux sujets ou répondent à des sujets existants.", diff --git a/public/language/fr/admin/settings/reputation.json b/public/language/fr/admin/settings/reputation.json index 2f894e3255..a888590efc 100644 --- a/public/language/fr/admin/settings/reputation.json +++ b/public/language/fr/admin/settings/reputation.json @@ -23,5 +23,9 @@ "flags.limit-per-target-placeholder": "Défaut: 0", "flags.limit-per-target-help": "Lorsqu'un message ou un utilisateur a été signalé plusieurs fois, chaque indicateur supplémentaire est considéré comme un \"rapport\". et ajouté au signalement d'origine. Définissez cette option sur un nombre autre que zéro pour limiter le nombre de rapports qu'un signalement peut admettre.", "flags.auto-flag-on-downvote-threshold": "Nombre de votes négatifs pour les signalements (0 pour désactiver, par défaut : 0)", - "flags.auto-resolve-on-ban": "Résoudre automatiquement tous les tickets d'un utilisateur lorsqu'il est banni" + "flags.auto-resolve-on-ban": "Résoudre automatiquement tous les tickets d'un utilisateur lorsqu'il est banni", + "flags.action-on-resolve": "Procédez comme suit lorsqu'un signalement est résolu", + "flags.action-on-reject": "Procédez comme suit lorsqu'un signalement est rejeté", + "flags.action.nothing": "Ne rien faire", + "flags.action.rescind": "Annuler la notification envoyée aux modérateurs/administrateurs" } \ No newline at end of file diff --git a/public/language/fr/admin/settings/uploads.json b/public/language/fr/admin/settings/uploads.json index 03fb1d47c1..86384a3acc 100644 --- a/public/language/fr/admin/settings/uploads.json +++ b/public/language/fr/admin/settings/uploads.json @@ -5,7 +5,7 @@ "strip-exif-data": "Supprimer les données EXIF", "preserve-orphaned-uploads": "Conserver les fichiers téléchargés après la suppression d'une publication.", "orphanExpiryDays": "Jours pour garder les fichiers orphelins", - "orphanExpiryDays-help": "After this many days, orphaned uploads will be deleted from the file system.
Set 0 or leave blank to disable.", + "orphanExpiryDays-help": "Les téléchargements orphelins seront supprimés du système de fichiers après ce délai :
Changer 0 Laissez vide pour désactiver.", "private-extensions": "Rendre privé des extensions de fichier.", "private-uploads-extensions-help": "Renseignez ici une liste d'extensions de fichiers séparées par des virgules pour les rendre privées (par exemple : pdf, xls, doc). Une liste vide signifie que tous les fichiers sont privés.", "resize-image-width-threshold": "Redimensionner les images si elles sont plus larges que la largeur spécifiée", diff --git a/public/language/fr/error.json b/public/language/fr/error.json index 6c8ad20a24..ba75c58a9e 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -205,8 +205,8 @@ "no-connection": "Il semble y avoir un problème avec votre connexion Internet", "socket-reconnect-failed": "Serveur inaccessible pour le moment. Cliquez ici pour réessayer ou réessayez plus tard", "plugin-not-whitelisted": "Impossible d'installer le plug-in – seuls les plugins mis en liste blanche dans le gestionnaire de packages NodeBB peuvent être installés via l'ACP", - "plugins-set-in-configuration": "You are not allowed to change plugin state as they are defined at runtime (config.json, environmental variables or terminal arguments), please modify the configuration instead.", - "theme-not-set-in-configuration": "When defining active plugins in configuration, changing themes requires adding the new theme to the list of active plugins before updating it in the ACP", + "plugins-set-in-configuration": "Vous n'êtes pas autorisé à modifier l'état des plugins car ils sont définis au moment de l'exécution (config.json, variables d'environnement ou arguments de terminal), veuillez plutôt modifier la configuration.", + "theme-not-set-in-configuration": "Lors de la définition des plugins actifs, le changement de thèmes nécessite d'ajouter le nouveau thème à la liste des plugins actifs avant de le mettre à jour dans l'ACP", "topic-event-unrecognized": "Événement du sujet '%1' non reconnu", "cant-set-child-as-parent": "Cette catégorie ne peut être une catégorie principale", "cant-set-self-as-parent": "Ne peut être définie comme catégorie principale", diff --git a/public/language/fr/user.json b/public/language/fr/user.json index 8ad069194c..bdede19408 100644 --- a/public/language/fr/user.json +++ b/public/language/fr/user.json @@ -195,5 +195,5 @@ "emailUpdate.optional": "Ce champ est facultatif. Vous n'êtes pas obligé de fournir votre adresse e-mail, mais sans e-mail validé, vous ne pourrez pas récupérer votre compte ou vous connecter avec votre e-mail.", "emailUpdate.required": "Ce champ est requis.", "emailUpdate.change-instructions": "Un mail de confirmation sera envoyé à l'adresse mail saisie avec un lien unique. L'accès à ce lien confirmera votre propriété de mail et elle deviendra active sur votre compte. À tout moment, vous pouvez mettre à jour votre mail enregistré depuis la page de votre compte.", - "emailUpdate.password-challenge": "Please enter your password in order to verify account ownership." + "emailUpdate.password-challenge": "Veuillez entrer votre mot de passe pour confirmer la propriété du compte." } \ No newline at end of file diff --git a/public/language/gl/admin/advanced/cache.json b/public/language/gl/admin/advanced/cache.json index 2fd7984883..0148c2d889 100644 --- a/public/language/gl/admin/advanced/cache.json +++ b/public/language/gl/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Post Cache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Full", "post-cache-size": "Post Cache Size", "items-in-cache": "Items in Cache" diff --git a/public/language/gl/admin/settings/post.json b/public/language/gl/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/gl/admin/settings/post.json +++ b/public/language/gl/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/gl/admin/settings/reputation.json b/public/language/gl/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/gl/admin/settings/reputation.json +++ b/public/language/gl/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/he/admin/advanced/cache.json b/public/language/he/admin/advanced/cache.json index 04ceceaa68..35a5167de9 100644 --- a/public/language/he/admin/advanced/cache.json +++ b/public/language/he/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "מטמון פוסטים", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Full", "post-cache-size": "גודל מטמון פוסטים", "items-in-cache": "פריטים במטמון" diff --git a/public/language/he/admin/settings/post.json b/public/language/he/admin/settings/post.json index ec29d28800..f3f938f47e 100644 --- a/public/language/he/admin/settings/post.json +++ b/public/language/he/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "השבת חתימות", "signature.no-links": "השבת קישורים בחתימות", "signature.no-images": "השבת תמונות בחתימות", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "אורך חתימה מרבי", "composer": "הגדרות יצירת פוסט", "composer-help": "ההגדרות הבאות חלות על הפונקציונליות ו/או המראה של יוצר הפוסט המוצג\n\t\t\t\tלמשתמשים בעת יצירת נושאים חדשים, או מענה לנושאים קיימים.", diff --git a/public/language/he/admin/settings/reputation.json b/public/language/he/admin/settings/reputation.json index 3646d253c9..a583635a09 100644 --- a/public/language/he/admin/settings/reputation.json +++ b/public/language/he/admin/settings/reputation.json @@ -23,5 +23,9 @@ "flags.limit-per-target-placeholder": "ברירת מחדל: 0", "flags.limit-per-target-help": "כשפוסט או משתמש מסומן כמה פעמים, כל דיווח נוסף נחשב ל "דיווח" ונוסף לדיווח הראשון. הגדר את האופציה הזאת לכל מספר שהוא לא 0 כדי להגביל את כמות הדיווחים שפוסט או משתמש יכול לקבל.", "flags.auto-flag-on-downvote-threshold": "מספר הצבעות למטה כדי ליצור דיווח אטומטי (הגדר ל-0 כדי להשבית; ברירת מחדל: 0)", - "flags.auto-resolve-on-ban": "פתור אוטומטי כל כרטיסי משתמש כאשר הוא מוחרם" + "flags.auto-resolve-on-ban": "פתור אוטומטי כל כרטיסי משתמש כאשר הוא מוחרם", + "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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/he/language.json b/public/language/he/language.json index 4e56641628..2c12710abf 100644 --- a/public/language/he/language.json +++ b/public/language/he/language.json @@ -1,5 +1,5 @@ { - "name": "אנגלית (בריטניה/קנדה)", + "name": "עברית (ישראל)", "code": "he", "dir": "rtl" } \ No newline at end of file diff --git a/public/language/he/modules.json b/public/language/he/modules.json index ebcf0e7d3b..bed09d654c 100644 --- a/public/language/he/modules.json +++ b/public/language/he/modules.json @@ -1,6 +1,6 @@ { "chat.chatting_with": "שוחחו בצ'אט עם", - "chat.placeholder": "כתבו את תוכן הודעת הצ'אט כאן, ניתן גם לגרור ולשחרר כאן תמונות, הקישו אנטר לשליחה.", + "chat.placeholder": "כתבו תוכן הודעת הצ'אט כאן, ניתן לגרור ולשחרר כאן תמונות, הקישו אנטר לשליחה.", "chat.scroll-up-alert": "הנכם צופים כעת בהודעות ישנות. לחצו כאן למעבר להודעה האחרונה.", "chat.send": "שליחה", "chat.no_active": "אין לכם צ'אטים פעילים", diff --git a/public/language/he/topic.json b/public/language/he/topic.json index a8fd87a73a..e9f6dc897d 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -113,7 +113,7 @@ "bookmark": "הוספה למועדפים", "bookmarks": "מועדפים", "bookmarks.has_no_bookmarks": "לא צירפתם פוסט למועדפים עדיין", - "copy-permalink": "העתקת קישור-קבוע", + "copy-permalink": "העתקת קישור ישיר", "loading_more_posts": "טוען פוסטים נוספים", "move_topic": "העברת נושא", "move_topics": "העברת נושאים", diff --git a/public/language/hr/admin/advanced/cache.json b/public/language/hr/admin/advanced/cache.json index 1cb6d611ce..34f7f2575a 100644 --- a/public/language/hr/admin/advanced/cache.json +++ b/public/language/hr/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Objava predmemorija", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Puno", "post-cache-size": "Veličina predmemorije objave", "items-in-cache": "Artikli u predmemoriji" diff --git a/public/language/hr/admin/settings/post.json b/public/language/hr/admin/settings/post.json index 21e8c03071..fa4eaaefcf 100644 --- a/public/language/hr/admin/settings/post.json +++ b/public/language/hr/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Onemogući potpise", "signature.no-links": "Onemogući odlazne poveznice u potpisima ", "signature.no-images": "Onemogući slike u potpisima", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Minimalna dužina potpisa", "composer": "Postavke Composer-a", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/hr/admin/settings/reputation.json b/public/language/hr/admin/settings/reputation.json index f2777fb7b2..7a2912931e 100644 --- a/public/language/hr/admin/settings/reputation.json +++ b/public/language/hr/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/hu/admin/advanced/cache.json b/public/language/hu/admin/advanced/cache.json index 448f1d093d..0bb92bb8e4 100644 --- a/public/language/hu/admin/advanced/cache.json +++ b/public/language/hu/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Hozzászólás gyorsítótár", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Tele", "post-cache-size": "Hozzászólás gyorsítótáras mérete", "items-in-cache": "Elemek a gyorsítótárban" diff --git a/public/language/hu/admin/settings/post.json b/public/language/hu/admin/settings/post.json index 0bdf3d228b..f46f0a12af 100644 --- a/public/language/hu/admin/settings/post.json +++ b/public/language/hu/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Aláírások kikapcsolása", "signature.no-links": "Linkek letiltása az aláírásokban", "signature.no-images": "Képek letiltása az aláírásokban", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Aláírás maximális hossza", "composer": "Szövegszerkesztő beállításai", "composer-help": "Az alábbi beállítások a felhasználóknak megjelenített szövegszerkesztő (témakör, hozzászólás vagy válasz írásánál)\n\t\t\t\tfunkcióit és/vagy megjelenését szabályozzák.", diff --git a/public/language/hu/admin/settings/reputation.json b/public/language/hu/admin/settings/reputation.json index 53a52afb3b..7d55bfd5e3 100644 --- a/public/language/hu/admin/settings/reputation.json +++ b/public/language/hu/admin/settings/reputation.json @@ -23,5 +23,9 @@ "flags.limit-per-target-placeholder": "Alapértelmezett: 0", "flags.limit-per-target-help": "Amikor egy hozzászólás vagy felhasználó több megjelölést kap, akkor minden megjelölés "jelentésnek" számít és hozzáadódik az eredeti megjelöléshez. Adj meg 0-tól eltérő értéket egy maximális jelölési szám beállításához.", "flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (Set to 0 to disable, default: 0)", - "flags.auto-resolve-on-ban": "A felhasználó összes megjelölésének feloldása, amikor kitiltásra kerül" + "flags.auto-resolve-on-ban": "A felhasználó összes megjelölésének feloldása, amikor kitiltásra kerül", + "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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/id/admin/advanced/cache.json b/public/language/id/admin/advanced/cache.json index 0e2366b9ad..edbb7f87ba 100644 --- a/public/language/id/admin/advanced/cache.json +++ b/public/language/id/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Cache Kiriman", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Penuh", "post-cache-size": "Ukuran Cache Kiriman", "items-in-cache": "Item di Cache" diff --git a/public/language/id/admin/settings/post.json b/public/language/id/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/id/admin/settings/post.json +++ b/public/language/id/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/id/admin/settings/reputation.json b/public/language/id/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/id/admin/settings/reputation.json +++ b/public/language/id/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/it/admin/advanced/cache.json b/public/language/it/admin/advanced/cache.json index dbd2a41961..2a023ace90 100644 --- a/public/language/it/admin/advanced/cache.json +++ b/public/language/it/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Cache Post", + "group-cache": "Cache di gruppo", + "local-cache": "Cache locale", + "object-cache": "Cache oggetti", "percent-full": "%1% Pieno", "post-cache-size": "Dimensione Cache dei Post", "items-in-cache": "Elementi nella Cache" diff --git a/public/language/it/admin/settings/email.json b/public/language/it/admin/settings/email.json index 180922117c..4d99b4399c 100644 --- a/public/language/it/admin/settings/email.json +++ b/public/language/it/admin/settings/email.json @@ -10,10 +10,10 @@ "smtp-transport-help": "Puoi selezionare da un elenco di servizi noti o inserirne uno personalizzato.", "smtp-transport.service": "Seleziona un servizio", "smtp-transport.service-custom": "Servizio personalizzato", - "smtp-transport.service-help": "Select a service name above in order to use the known information about it. Alternatively, select "Custom Service" and enter the details below.", - "smtp-transport.gmail-warning1": "If you are using GMail as your email provider, you will have to generate an "App Password" in order for NodeBB to authenticate successfully. You can generate one at the App Passwords page.", - "smtp-transport.gmail-warning2": "For more information about this workaround, please consult this NodeMailer article on the issue. An alternative would be to utilise a third-party emailer plugin such as SendGrid, Mailgun, etc. Browse available plugins here.", - "smtp-transport.auto-enable-toast": "It looks like you're configuring an SMTP transport. We enabled the \"SMTP Transport\" option for you.", + "smtp-transport.service-help": "Selezionare il nome di un servizio per utilizzare le informazioni note su di esso. In alternativa, selezionare "Servizio personalizzato" e inserire i dettagli qui sotto.", + "smtp-transport.gmail-warning1": "Se si utilizza GMail come provider di posta elettronica, è necessario generare una "Password dell'app" affinché NodeBB possa autenticarsi con successo. Puoi generarne una alla pagina Password dell'app .", + "smtp-transport.gmail-warning2": "Per ulteriori informazioni su questa soluzione alternativa, si prega di consultare questo articolo NodeMailer sulla questione. Un'alternativa sarebbe utilizzare un plug-in di posta elettronica di terze parti come SendGrid, Mailgun, ecc. Sfoglia i plugin disponibili qui.", + "smtp-transport.auto-enable-toast": "Sembra che tu stia configurando un trasporto SMTP. Abbiamo abilitato l'opzione \"Trasporto SMTP\" per te.", "smtp-transport.host": "Host SMTP", "smtp-transport.port": "Porta SMTP", "smtp-transport.security": "Sicurezza connessione", diff --git a/public/language/it/admin/settings/post.json b/public/language/it/admin/settings/post.json index 74c8a44199..76cd524c6b 100644 --- a/public/language/it/admin/settings/post.json +++ b/public/language/it/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disabilita le firme", "signature.no-links": "Disabilita i collegamenti nelle firme", "signature.no-images": "Disabilita le immagini nelle firme", + "signature.hide-duplicates": "Nascondi firme duplicate nelle discussioni", "signature.max-length": "Lunghezza massima della firma", "composer": "Impostazioni del compositore", "composer-help": "Le seguenti impostazioni regolano la funzionalità e/o l'aspetto del post compositore mostrato\n\t\t\t\tagli utenti quando creano nuove discussioni o rispondono a discussioni esistenti.", diff --git a/public/language/it/admin/settings/reputation.json b/public/language/it/admin/settings/reputation.json index 66037677e0..e98fc9bcec 100644 --- a/public/language/it/admin/settings/reputation.json +++ b/public/language/it/admin/settings/reputation.json @@ -23,5 +23,9 @@ "flags.limit-per-target-placeholder": "Predefinito: 0", "flags.limit-per-target-help": "Quando un post o un utente viene segnalato più volte, ogni segnalazione aggiuntiva è considerata una "report" e aggiunto alla segnalazione originale. Imposta questa opzione su un numero diverso da zero per limitare il numero di rapporti che un elemento può ricevere.", "flags.auto-flag-on-downvote-threshold": "Numero di voti negativi per contrassegnare automaticamente i post (impostare a 0 per disabilitare, predefinito: 0)", - "flags.auto-resolve-on-ban": "Risolvi automaticamente tutti i ticket di un utente quando vengono bannati" + "flags.auto-resolve-on-ban": "Risolvi automaticamente tutti i ticket di un utente quando vengono bannati", + "flags.action-on-resolve": "Esegui le seguenti operazioni quando una segnalazione viene risolta", + "flags.action-on-reject": "Esegui le seguenti operazioni quando una segnalazione viene rifiutata", + "flags.action.nothing": "Non fare nulla", + "flags.action.rescind": "Annulla l'invio della notifica ai moderatori/amministratori" } \ No newline at end of file diff --git a/public/language/it/user.json b/public/language/it/user.json index e32ccc332f..d9055d7618 100644 --- a/public/language/it/user.json +++ b/public/language/it/user.json @@ -195,5 +195,5 @@ "emailUpdate.optional": "Questo campo è facoltativo. Non sei obbligato a fornire il tuo indirizzo email, ma senza un'email convalidata non sarai in grado di recuperare il tuo account o di accedere con la tua email.", "emailUpdate.required": "Questo campo è obbligatorio.", "emailUpdate.change-instructions": "Un'email di conferma sarà inviata all'indirizzo email inserito con un link unico. Accedendo a quel link confermerai la tua proprietà dell'indirizzo email e questo diventerà attivo sul tuo account. In qualsiasi momento, sei in grado di aggiornare la tua email in archivio dalla pagina del tuo account.", - "emailUpdate.password-challenge": "Please enter your password in order to verify account ownership." + "emailUpdate.password-challenge": "Inserisci la tua password per verificare la proprietà dell'account." } \ No newline at end of file diff --git a/public/language/ja/admin/advanced/cache.json b/public/language/ja/admin/advanced/cache.json index f757b411ad..bd02037b88 100644 --- a/public/language/ja/admin/advanced/cache.json +++ b/public/language/ja/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "投稿キャッシュ", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% がフル", "post-cache-size": "投稿キャッシュのサイズ", "items-in-cache": "キャッシュ内のアイテム" diff --git a/public/language/ja/admin/settings/post.json b/public/language/ja/admin/settings/post.json index 8c0502c8d2..9562312fd7 100644 --- a/public/language/ja/admin/settings/post.json +++ b/public/language/ja/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "署名を無効にする", "signature.no-links": "署名内のリンクを無効にする", "signature.no-images": "署名内の画像を無効にする", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "署名の最大文字数", "composer": "Composerの設定", "composer-help": "次の設定は、投稿者の機能や外観を制御します。\n\\t\\t\\t\\tユーザーに新しいスレッドを作成したり、既存のトピックに返信したりできます。", diff --git a/public/language/ja/admin/settings/reputation.json b/public/language/ja/admin/settings/reputation.json index 936b6919f7..0e3e3dfcd8 100644 --- a/public/language/ja/admin/settings/reputation.json +++ b/public/language/ja/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/ko/admin/advanced/cache.json b/public/language/ko/admin/advanced/cache.json index 80e6518376..8b8b37cf3c 100644 --- a/public/language/ko/admin/advanced/cache.json +++ b/public/language/ko/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "포스트 캐시", + "group-cache": "그룹 캐시", + "local-cache": "자체 캐시", + "object-cache": "오프젝트 캐시", "percent-full": "%1%꽉참", "post-cache-size": "포스트 캐시 크기", "items-in-cache": "캐시된 항목들" diff --git a/public/language/ko/admin/settings/post.json b/public/language/ko/admin/settings/post.json index a2ea9e3e67..4635b87996 100644 --- a/public/language/ko/admin/settings/post.json +++ b/public/language/ko/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "서명 비활성화", "signature.no-links": "서명에 포함된 바로가기 비활성화", "signature.no-images": "서명에 포함된 이미지 비활성화", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "최대 서명 길이", "composer": "에디터 설정", "composer-help": "아래의 설정들은 사용자가 새로운 화제나 답글을 작성할 때 나타나는 에디터 화면의 기능과 외형에 영향을 끼칩니다.", diff --git a/public/language/ko/admin/settings/reputation.json b/public/language/ko/admin/settings/reputation.json index f64609ea93..42ccf3753b 100644 --- a/public/language/ko/admin/settings/reputation.json +++ b/public/language/ko/admin/settings/reputation.json @@ -23,5 +23,9 @@ "flags.limit-per-target-placeholder": "기본값: 0", "flags.limit-per-target-help": "포스트나 사용자가 다수의 신고를 받을 경우 각각의 신고가 최초의 신고와 함께 표시됩니다. 이 옵션을 변경해서 하나의 대상에 누적될 신고의 최대 횟수를 지정할 수 있습니다.", "flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (Set to 0 to disable, default: 0)", - "flags.auto-resolve-on-ban": "차단될 경우 사용자의 모든 기회 박탈" + "flags.auto-resolve-on-ban": "차단될 경우 사용자의 모든 기회 박탈", + "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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/ko/error.json b/public/language/ko/error.json index f37a5a103d..a993734ce1 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -160,8 +160,8 @@ "downvoting-disabled": "비추천 기능이 비활성 상태입니다.", "not-enough-reputation-to-chat": "You need %1 reputation to chat", "not-enough-reputation-to-upvote": "You need %1 reputation to upvote", - "not-enough-reputation-to-downvote": "You need %1 reputation to downvote", - "not-enough-reputation-to-flag": "You need %1 reputation to flag this post", + "not-enough-reputation-to-downvote": "오직 1%", + "not-enough-reputation-to-flag": "이 포스트를 플래그하려면 1%가 더 필요합니다.", "not-enough-reputation-min-rep-website": "You need %1 reputation to add a website", "not-enough-reputation-min-rep-aboutme": "You need %1 reputation to add an about me", "not-enough-reputation-min-rep-signature": "You need %1 reputation to add a signature", diff --git a/public/language/ko/global.json b/public/language/ko/global.json index 6e1fb5b669..efe647adcb 100644 --- a/public/language/ko/global.json +++ b/public/language/ko/global.json @@ -23,7 +23,7 @@ "close": "닫기", "pagination": "페이지", "pagination.out_of": "현재: %1 / 전체: %2", - "pagination.enter_index": "Go to post index", + "pagination.enter_index": "포스트 인덱스로", "header.admin": "관리자", "header.categories": "카테고리", "header.recent": "최근", diff --git a/public/language/ko/modules.json b/public/language/ko/modules.json index 8e4079e84f..b62472aa1f 100644 --- a/public/language/ko/modules.json +++ b/public/language/ko/modules.json @@ -1,12 +1,12 @@ { "chat.chatting_with": "채팅", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", + "chat.placeholder": "여기에 메시지를 쓰고, 이미지를 드래그 앤 드롭하고, Enter를 눌러 보내세요!", "chat.scroll-up-alert": "오래된 메시지를 보고 있습니다. 여기를 눌러 최신 메시지로 이동하세요.", "chat.send": "전송", "chat.no_active": "활성화된 채팅이 없습니다.", "chat.user_typing": "%1님이 입력 중...", "chat.user_has_messaged_you": "%1님이 메시지를 보냈습니다.", - "chat.see_all": "All chats", + "chat.see_all": "모든 채팅", "chat.mark_all_read": "Mark all read", "chat.no-messages": "채팅 기록을 보려면 채팅 상대를 선택하세요.", "chat.no-users-in-room": "채팅방에 사용자 없음", diff --git a/public/language/ko/notifications.json b/public/language/ko/notifications.json index 26d9613535..658b8b0c2c 100644 --- a/public/language/ko/notifications.json +++ b/public/language/ko/notifications.json @@ -1,8 +1,8 @@ { "title": "알림", "no_notifs": "새로운 알림이 없습니다.", - "see_all": "All notifications", - "mark_all_read": "Mark all read", + "see_all": "모든 알림", + "mark_all_read": "모두 읽음으로 표시", "back_to_home": "%1(으)로 돌아가기", "outgoing_link": "외부 링크", "outgoing_link_message": "%1(을)를 떠납니다.", diff --git a/public/language/lt/admin/advanced/cache.json b/public/language/lt/admin/advanced/cache.json index 2fd7984883..0148c2d889 100644 --- a/public/language/lt/admin/advanced/cache.json +++ b/public/language/lt/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Post Cache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Full", "post-cache-size": "Post Cache Size", "items-in-cache": "Items in Cache" diff --git a/public/language/lt/admin/settings/post.json b/public/language/lt/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/lt/admin/settings/post.json +++ b/public/language/lt/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/lt/admin/settings/reputation.json b/public/language/lt/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/lt/admin/settings/reputation.json +++ b/public/language/lt/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/lv/admin/advanced/cache.json b/public/language/lv/admin/advanced/cache.json index 7e59a8aea7..2e083938b5 100644 --- a/public/language/lv/admin/advanced/cache.json +++ b/public/language/lv/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Rakstu kešatmiņa", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Aizņemts", "post-cache-size": "Rakstu kešatmiņas lielums", "items-in-cache": "Rakstu skaits kešatmiņā" diff --git a/public/language/lv/admin/settings/post.json b/public/language/lv/admin/settings/post.json index a6dfd4826c..e7529f2a0d 100644 --- a/public/language/lv/admin/settings/post.json +++ b/public/language/lv/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Atspējot parakstus", "signature.no-links": "Atspējot saites parakstos", "signature.no-images": "Atspējot bildes parakstos", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maksimālais paraksta garums", "composer": "Redaktora iestatījumi", "composer-help": "Tālāk norādītie iestatījumi nosaka funkcionalitāti un izskatu no raksta redaktoru, ko lieto jaunus tematus izveidojot, vai atbildot jau eksistējošiem tematiem.", diff --git a/public/language/lv/admin/settings/reputation.json b/public/language/lv/admin/settings/reputation.json index 7fd0789444..a290ac2ab4 100644 --- a/public/language/lv/admin/settings/reputation.json +++ b/public/language/lv/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/ms/admin/advanced/cache.json b/public/language/ms/admin/advanced/cache.json index 2fd7984883..0148c2d889 100644 --- a/public/language/ms/admin/advanced/cache.json +++ b/public/language/ms/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Post Cache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Full", "post-cache-size": "Post Cache Size", "items-in-cache": "Items in Cache" diff --git a/public/language/ms/admin/settings/post.json b/public/language/ms/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/ms/admin/settings/post.json +++ b/public/language/ms/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/ms/admin/settings/reputation.json b/public/language/ms/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/ms/admin/settings/reputation.json +++ b/public/language/ms/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/nb/admin/advanced/cache.json b/public/language/nb/admin/advanced/cache.json index fea789ab96..f75eabe4cd 100644 --- a/public/language/nb/admin/advanced/cache.json +++ b/public/language/nb/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Post-buffer", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1%full ", "post-cache-size": "Post-buffer størrelse", "items-in-cache": "Element i buffer" diff --git a/public/language/nb/admin/settings/post.json b/public/language/nb/admin/settings/post.json index bac4225532..68f031bacc 100644 --- a/public/language/nb/admin/settings/post.json +++ b/public/language/nb/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "Følgende innstillinger styrer funksjonaliteten og/ eller utseendet til skriveverktøyet vist\n\t\t\t\ttil brukere når de lager nye tråder, eller svarer på eksisterende tråder.", diff --git a/public/language/nb/admin/settings/reputation.json b/public/language/nb/admin/settings/reputation.json index 22bbbccabc..59cf488dea 100644 --- a/public/language/nb/admin/settings/reputation.json +++ b/public/language/nb/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/nl/admin/advanced/cache.json b/public/language/nl/admin/advanced/cache.json index 6cd668fe6b..67cef0c6b5 100644 --- a/public/language/nl/admin/advanced/cache.json +++ b/public/language/nl/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Onderwerpcache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1%vol", "post-cache-size": "Onderwerpcache grootte", "items-in-cache": "Items in cache" diff --git a/public/language/nl/admin/settings/post.json b/public/language/nl/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/nl/admin/settings/post.json +++ b/public/language/nl/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/nl/admin/settings/reputation.json b/public/language/nl/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/nl/admin/settings/reputation.json +++ b/public/language/nl/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/pl/admin/advanced/cache.json b/public/language/pl/admin/advanced/cache.json index 5c2469a7da..57dbfddd78 100644 --- a/public/language/pl/admin/advanced/cache.json +++ b/public/language/pl/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Pamięć podręczna postów", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1%", "post-cache-size": "Rozmiar pamięci podręcznej postów", "items-in-cache": "Elementów w pamięci podręcznej" diff --git a/public/language/pl/admin/settings/post.json b/public/language/pl/admin/settings/post.json index 9374e26e45..140adf9302 100644 --- a/public/language/pl/admin/settings/post.json +++ b/public/language/pl/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Wyłącz sygnatury", "signature.no-links": "Wyłącz odnośniki w sygnaturach", "signature.no-images": "Wyłącz obrazy w sygnaturach", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maksymalna długość sygnatury", "composer": "Ustawienia okna pisania", "composer-help": "Następujące ustawienia zarządzają funkcjonalnością oraz/lub wyglądem okna pisania postów wyświetlanego\n\t\t\t\tużytkownikom, gdy tworzą nowe tematy lub odpowiadają w istniejących.", diff --git a/public/language/pl/admin/settings/reputation.json b/public/language/pl/admin/settings/reputation.json index 5f7aafef9f..2b5dfae219 100644 --- a/public/language/pl/admin/settings/reputation.json +++ b/public/language/pl/admin/settings/reputation.json @@ -23,5 +23,9 @@ "flags.limit-per-target-placeholder": "Domyślnie: 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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/pl/category.json b/public/language/pl/category.json index 1888752931..4bddf861b4 100644 --- a/public/language/pl/category.json +++ b/public/language/pl/category.json @@ -19,5 +19,5 @@ "notwatching.message": "Obserwujesz teraz aktualizacje tej kategorii i wszystkie podkategorie", "ignoring.message": "Obserwujesz teraz aktualizacje tej kategorii i wszystkie podkategorie", "watched-categories": "Obserwowane kategorie", - "x-more-categories": "%1 more categories" + "x-more-categories": "$1 więcej kategorii" } \ No newline at end of file diff --git a/public/language/pl/email.json b/public/language/pl/email.json index 9befe6f24f..13dd96a274 100644 --- a/public/language/pl/email.json +++ b/public/language/pl/email.json @@ -6,9 +6,9 @@ "greeting_no_name": "Witaj", "greeting_with_name": "Witaj, %1", "email.verify-your-email.subject": "Zweryfikuj swój adres e-mail", - "email.verify.text1": "You've requested that we change or confirm your email address", - "email.verify.text2": "For security purposes, we only change or confirm the email address on file once its ownership has been confirmed via email. If you did not request this, no action is required on your part.", - "email.verify.text3": "Once you confirm this email address, we will replace your current email address with this one (%1).", + "email.verify.text1": "Zażądałeś zmiany albo potwierdzenia swojego adresu email", + "email.verify.text2": "Ze względów bezpieczeństwa, możemy zmienić lub potwierdzić adres email, wtedy gdy został zweryfikowany jako należący do Ciebie. Jeżeli to nie Ty wysłałeś to żądanie, nie musisz robić nic.", + "email.verify.text3": "Jak potwierdzisz swój adres email, zamienimy Twój obecny adres email na ten (%1).", "welcome.text1": "Dziękujemy za rejestrację na %1", "welcome.text2": "Aby w pełni aktywować konto, musisz potwierdzić, że podany adres e-mail należy do Ciebie.", "welcome.text3": "Administrator zaakceptował Twoją prośbę o rejestrację. Możesz się teraz zalogować za pomocą swojej nazwy użytkownika i hasła.", @@ -23,8 +23,8 @@ "reset.notify.text1": "Informujemy, że Twoje hasło na %1 zostało zmienione.", "reset.notify.text2": "Jeśli nie wyraziłeś na to zgody, niezwłocznie poinformuj administratora.", "digest.latest_topics": "Ostatnie tematy z %1", - "digest.top-topics": "Top topics from %1", - "digest.popular-topics": "Popular topics from %1", + "digest.top-topics": "Topowe tematy z %1", + "digest.popular-topics": "Najpopularniejsze tematy z %1", "digest.cta": "Kliknij tutaj, by przejść do %1", "digest.unsub.info": "To podsumowanie zostało wysłane zgodnie z Twoimi ustawieniami.", "digest.day": "dni", @@ -48,8 +48,8 @@ "unsub.cta": "Kliknij tutaj, aby zmienić te ustawienia", "unsubscribe": "Wypisz się", "unsub.success": "Nie będziesz już otrzymywać wiadomości e-mail z %1", - "unsub.failure.title": "Unable to unsubscribe", - "unsub.failure.message": "Unfortunately, we were not able to unsubscribe you from the mailing list, as there was an issue with the link. However, you can alter your email preferences by going to your user settings.

(error: %1)", + "unsub.failure.title": "Nie udało się odsubskrybować", + "unsub.failure.message": "Niestety nie udało nam się wypisać Cię z listy mailingowej, ponieważ wystąpił problem z linkiem. Możesz jednak zmienić swoje preferencje dotyczące poczty e-mail, przechodząc do Twoich ustawień.

(błąd: %1)", "banned.subject": "Zostałeś zbanowany na %1", "banned.text1": "Użytkownik %1 został zbanowany na %2.", "banned.text2": "Ban potrwa do %1", diff --git a/public/language/pl/error.json b/public/language/pl/error.json index 8eb54a3270..1790700f13 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -1,7 +1,7 @@ { "invalid-data": "Nieprawidłowe dane", "invalid-json": "Niewłaściwy JSON", - "wrong-parameter-type": "A value of type %3 was expected for property `%1`, but %2 was received instead", + "wrong-parameter-type": "Wartość typu %3 była oczekiwania dla właściwości `%1`, ale %2 został dostarczony", "required-parameters-missing": "Required parameters were missing from this API call: %1", "not-logged-in": "Nie jesteś zalogowany/a.", "account-locked": "Twoje konto zostało tymczasowo zablokowane", @@ -12,7 +12,7 @@ "invalid-pid": "Nieprawidłowy ID posta", "invalid-uid": "Nieprawidłowy ID użytkownika", "invalid-mid": "Invalid Chat Message ID", - "invalid-date": "A valid date must be provided", + "invalid-date": "Musi być podana prawidłowa data ", "invalid-username": "Nieprawidłowy login", "invalid-email": "Nieprawidłowy adres e-mail", "invalid-fullname": "Nieprawidłowa nazwa", @@ -25,21 +25,21 @@ "invalid-username-or-password": "Podaj nazwę użytkownika i hasło", "invalid-search-term": "Błędne wyszukiwane wyrażenie", "invalid-url": "Błąd w adresie URL.", - "invalid-event": "Invalid event: %1", + "invalid-event": "Nieprawidłowe zdarzenie: %1", "local-login-disabled": "System lokalnego logowania został wyłączony dla kont bez uprawnień.", "csrf-invalid": "Logowanie nie powiodło się, zapewne na skutek wygaśnięcia sesji. Spróbuj ponownie.", - "invalid-path": "Invalid path", - "folder-exists": "Folder exists", + "invalid-path": "Nieprawidłowa ścieżka", + "folder-exists": "Folder istnieje", "invalid-pagination-value": "Błędna wartość paginacji, zakres od %1 do %2", "username-taken": "Login zajęty", "email-taken": "Email zajęty", - "email-nochange": "The email entered is the same as the email already on file.", - "email-invited": "Email was already invited", - "email-not-confirmed": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.", + "email-nochange": "Podany email jest taki sam jak ten już zapisany.", + "email-invited": "Ten adres email otrzymał już zaproszenie", + "email-not-confirmed": "Pisanie w niektórych kategoriach albo tematach jest dozwolone wtedy gdy Twój adres email został zweryfikowany, proszę kliknij tutaj aby wysłać potwierdzający email.", "email-not-confirmed-chat": "Nie możesz prowadzić rozmów, dopóki twój email nie zostanie potwierdzony. Kliknij tutaj, aby potwierdzić swój email.", - "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You may not be able to post in some categories or chat until your email is confirmed.", - "no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery, and may be necessary for chatting and posting in some categories. Please click here to enter an email.", - "user-doesnt-have-email": "User \"%1\" does not have an email set.", + "email-not-confirmed-email-sent": "Twój email nie został jeszcze zweryfikowany, proszę sprawdź swoją skrzynkę pocztową. Do tego czasu możesz nie móc pisać w niektórych kategoriach albo rozmawiać na czacie.", + "no-email-to-confirm": "Twoje konto nie ma ustawionego adresu email. Adres email jest konieczny w celu odzyskania konta i może być wymagany do pisania na czacie a także pisania w niektórych kategoriach. Proszę kliknij tutaj aby podać adres email.", + "user-doesnt-have-email": "Użytkownik \"%1\" nie ma ustawionego adresu email.", "email-confirm-failed": "Nie byliśmy w stanie potwierdzić Twojego adresu e-mail. Spróbuj później.", "confirm-email-already-sent": "Email potwierdzający został już wysłany, proszę odczekaj jeszcze %1 minut(y), aby wysłać kolejny.", "sendmail-not-found": "Program sendmail nie został znaleziony, proszę upewnij się, że jest zainstalowany i możliwy do uruchomienia przez użytkownika uruchamiającego NodeBB.", @@ -48,7 +48,7 @@ "username-too-long": "Zbyt długa nazwa użytkownika", "password-too-long": "Hasło jest za długie", "reset-rate-limited": "Zbyt wiele żądań resetowania hasła (ograniczona ilość)", - "reset-same-password": "Please use a password that is different from your current one", + "reset-same-password": "Proszę użyj innego hasła niż Twoje obecne", "user-banned": "Użytkownik zbanowany", "user-banned-reason": "Twoje konto zostało zablokowane (Powód: %1)", "user-banned-reason-until": "Przepraszamy, to konto zostało zbanowane do %1 (Powód: %2)", @@ -109,13 +109,13 @@ "already-unbookmarked": "Już usunąłeś ten post z zakładek", "cant-ban-other-admins": "Nie możesz zbanować innych adminów!", "cant-mute-other-admins": "You can't mute other admins!", - "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", - "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", + "user-muted-for-hours": "Zostałeś wyciszony, będziesz mógł pisać po upływie %1 godziny(godzin)", + "user-muted-for-minutes": "Zostałeś wyciszony, będziesz mógł pisać po upływie %1 minut", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Jesteś jedynym administratorem. Dodaj innego użytkownika jako administratora przed usunięciem siebie z tej grupy", - "account-deletion-disabled": "Account deletion is disabled", + "account-deletion-disabled": "Usuwanie konta jest wyłączone", "cant-delete-admin": "Usuń uprawnienia administratora z tego konta przed próbą jego usunięcia.", - "already-deleting": "Already deleting", + "already-deleting": "W trakcie usuwania", "invalid-image": "Błędny obraz.", "invalid-image-type": "Błędny typ obrazka. Dozwolone typy to: %1", "invalid-image-extension": "Błędne rozszerzenie pliku", @@ -159,22 +159,22 @@ "reputation-system-disabled": "System reputacji jest wyłączony.", "downvoting-disabled": "Negatywna ocena postów jest wyłączona", "not-enough-reputation-to-chat": "You need %1 reputation to chat", - "not-enough-reputation-to-upvote": "You need %1 reputation to upvote", - "not-enough-reputation-to-downvote": "You need %1 reputation to downvote", + "not-enough-reputation-to-upvote": "Potrzebujesz %1 reputacji aby głosować pozytywnie", + "not-enough-reputation-to-downvote": "Potrzebujesz %1 reputacji aby głosować negatywnie", "not-enough-reputation-to-flag": "You need %1 reputation to flag this post", "not-enough-reputation-min-rep-website": "You need %1 reputation to add a website", - "not-enough-reputation-min-rep-aboutme": "You need %1 reputation to add an about me", - "not-enough-reputation-min-rep-signature": "You need %1 reputation to add a signature", - "not-enough-reputation-min-rep-profile-picture": "You need %1 reputation to add a profile picture", - "not-enough-reputation-min-rep-cover-picture": "You need %1 reputation to add a cover picture", + "not-enough-reputation-min-rep-aboutme": "Potrzebujesz %1 reputacji aby dodać sekcję o mnie", + "not-enough-reputation-min-rep-signature": "Potrzebujesz %1 reputacji aby dodać podpis", + "not-enough-reputation-min-rep-profile-picture": "Potrzebujesz %1 reputacji aby dodać zdjęcie profilowe", + "not-enough-reputation-min-rep-cover-picture": "Potrzebujesz %1 reputacji aby dodać zdjęcie w tle", "post-already-flagged": "Ten post został już przez Ciebie oflagowany", "user-already-flagged": "Ten użytkownik został już przez ciebie oflagowany", "post-flagged-too-many-times": "Ten post został już oflagowany przez innych użytkowników", "user-flagged-too-many-times": "Ten użytkownik został już oflagowany przez innych użytkowników", "cant-flag-privileged": "You are not allowed to flag the profiles or content of privileged users (moderators/global moderators/admins)", "self-vote": "Nie możesz głosować na swój własny wpis.", - "too-many-upvotes-today": "You can only upvote %1 times a day", - "too-many-upvotes-today-user": "You can only upvote a user %1 times a day", + "too-many-upvotes-today": "Możesz jedynie oceniać pozytywnie %1 razy dziennie", + "too-many-upvotes-today-user": "Możesz jedynie oceniać danego użytkownika pozytywnie %1 razy dziennie", "too-many-downvotes-today": "Możesz głosować przeciw postowi tylko %1 razy dziennie", "too-many-downvotes-today-user": "Możesz głosować przeciwko użytkownikowi tylko %1 razy dziennie", "reload-failed": "NodeBB napotkało problem w czasie przeładowywania \"%1\". Forum będzie nadal dostarczać istniejące zasoby strony klienta, jednak powinieneś cofnąć ostatnią akcję.", @@ -190,10 +190,10 @@ "cant-kick-self": "Nie możesz wyrzucić samego siebie z grupy", "no-users-selected": "Nie wybrano żadnych użytkowników", "invalid-home-page-route": "Niepoprawny odnośnik strony domowej", - "invalid-session": "Invalid Session", - "invalid-session-text": "It looks like your login session is no longer active. Please refresh this page.", - "session-mismatch": "Session Mismatch", - "session-mismatch-text": "It looks like your login session no longer matches with the server. Please refresh this page.", + "invalid-session": "Nieprawidłowa sesja", + "invalid-session-text": "Wygląda na to, że Twoja sesja wygasła. Proszę odśwież stronę.", + "session-mismatch": "Niezgodność sesji", + "session-mismatch-text": "Wygląda na to, że Twoja sesja nie jest odpowiednia dla serwera. Proszę odśwież tą stronę.", "no-topics-selected": "Nie wybrano tematów.", "cant-move-to-same-topic": "Nie można przenieść wpisu do tego samego tematu!", "cant-move-topic-to-same-category": "Nie można przenieść tematu do tej samej kategorii!", @@ -203,7 +203,7 @@ "already-blocked": "Ten użytkownik jest już zablokowany", "already-unblocked": "Ten użytkownik jest już odblokowany", "no-connection": "Sprawdź swoje połączenie z internetem", - "socket-reconnect-failed": "Unable to reach the server at this time. Click here to try again, or try again later", + "socket-reconnect-failed": "W tej chwili nie można połączyć się z serwerem. Kliknij tutaj, aby spróbować ponownie, lub spróbuj ponownie później", "plugin-not-whitelisted": "Unable to install plugin – only plugins whitelisted by the NodeBB Package Manager can be installed via the ACP", "plugins-set-in-configuration": "You are not allowed to change plugin state as they are defined at runtime (config.json, environmental variables or terminal arguments), please modify the configuration instead.", "theme-not-set-in-configuration": "When defining active plugins in configuration, changing themes requires adding the new theme to the list of active plugins before updating it in the ACP", @@ -211,13 +211,13 @@ "cant-set-child-as-parent": "Can't set child as parent category", "cant-set-self-as-parent": "Can't set self as parent category", "api.master-token-no-uid": "A master token was received without a corresponding `_uid` in the request body", - "api.400": "Something was wrong with the request payload you passed in.", - "api.401": "A valid login session was not found. Please log in and try again.", - "api.403": "You are not authorised to make this call", + "api.400": "Coś było nie tak z przekazaną treścią żądania.", + "api.401": "Poprawna sesja logowanie nie została znaleziona. Proszę zaloguj się i spróbuj ponownie.", + "api.403": "Nie masz uprawnień do wykonania tego żądania", "api.404": "Invalid API call", - "api.426": "HTTPS is required for requests to the write api, please re-send your request via HTTPS", - "api.429": "You have made too many requests, please try again later", - "api.500": "An unexpected error was encountered while attempting to service your request.", + "api.426": "HTTPS jest wymagany dla żądań do API zapisu, wyślij ponownie żądanie przez HTTPS", + "api.429": "Został przekroczony limit żądań, proszę spróbuj ponownie później", + "api.500": "Wystąpił nieoczekiwany błąd podczas próby obsługi Twojego żądania.", "api.501": "The route you are trying to call is not implemented yet, please try again tomorrow", - "api.503": "The route you are trying to call is not currently available due to a server configuration" + "api.503": "Ścieżka z którą próbujesz się połączyć, jest obecnie niedostępna z powodu konfiguracji serwera" } \ No newline at end of file diff --git a/public/language/pl/global.json b/public/language/pl/global.json index 4a096c650b..7f4600a6cb 100644 --- a/public/language/pl/global.json +++ b/public/language/pl/global.json @@ -23,7 +23,7 @@ "close": "Zamknij", "pagination": "Numerowanie stron", "pagination.out_of": "%1 z %2", - "pagination.enter_index": "Go to post index", + "pagination.enter_index": "Skocz do postu", "header.admin": "Administracja", "header.categories": "Kategorie", "header.recent": "Ostatnie", @@ -46,19 +46,19 @@ "alert.success": "Udało się", "alert.error": "Błąd", "alert.banned": "Ban", - "alert.banned.message": "You have just been banned, your access is now restricted.", - "alert.unbanned": "Unbanned", - "alert.unbanned.message": "Your ban has been lifted.", + "alert.banned.message": "Zostałeś zbanowany i Twoje konto jest teraz w trybie ograniczonych możliwości", + "alert.unbanned": "Odbanowany", + "alert.unbanned.message": "Twój ban został zniesiony", "alert.unfollow": "Nie obserwujesz już %1.", "alert.follow": "Obserwujesz %1.", "users": "Użytkownicy", "topics": "Tematy", "posts": "Posty", - "x-posts": "%1 posts", + "x-posts": "%1 posty", "best": "Najlepsze", - "controversial": "Controversial", + "controversial": "Kontrowersyjne", "votes": "Głosy", - "x-votes": "%1 votes", + "x-votes": "%1 głosy", "voters": "Głosujący", "upvoters": "Głosujący za", "upvoted": "Oddane głosy za", @@ -71,7 +71,7 @@ "firstpost": "Pierwszy post", "read_more": "czytaj więcej", "more": "Więcej", - "none": "None", + "none": "Żadna", "posted_ago_by_guest": "wysłany %1 przez Gościa", "posted_ago_by": "wysłany %1 przez %2", "posted_ago": "wysłany %1", @@ -98,7 +98,7 @@ "guests": "Goście", "former_user": "Dawny użytkownik", "system-user": "System", - "unknown-user": "Unknown user", + "unknown-user": "Nieznany użytkownik", "updated.title": "Forum zaktualizowane", "updated.message": "To forum zostało zaktualizowane do najnowszej wersji. Kliknij tutaj, by odświeżyć stronę.", "privacy": "Prywatność", diff --git a/public/language/pl/modules.json b/public/language/pl/modules.json index 26c555a25f..bf26e04ef3 100644 --- a/public/language/pl/modules.json +++ b/public/language/pl/modules.json @@ -1,13 +1,13 @@ { "chat.chatting_with": "Czatuj z", - "chat.placeholder": "Type chat message here, drag & drop images, press enter to send", + "chat.placeholder": "Wpisz tutaj wiadomość, przeciągnij i opuść obrazki, kliknij enter aby wysłać", "chat.scroll-up-alert": "Przeglądasz starsze wiadomości, naciśnij tutaj by przejść do najnowszych", "chat.send": "Wyślij", "chat.no_active": "Brak aktywnych czatów", "chat.user_typing": "%1 pisze...", "chat.user_has_messaged_you": "%1 napisał do Ciebie", - "chat.see_all": "All chats", - "chat.mark_all_read": "Mark all read", + "chat.see_all": "Wszystkie rozmowy", + "chat.mark_all_read": "Zaznacz wszystkie jako przeczytane", "chat.no-messages": "Wybierz adresata, by wyświetlić historię czatów", "chat.no-users-in-room": "Brak użytkowników w tym pokoju", "chat.recent-chats": "Ostatnie czaty", @@ -73,10 +73,10 @@ "cover.dragging_title": "Pozycjonowanie tła", "cover.dragging_message": "Przeciągnij zdjęcie tła do wybranej pozycji i kliknij „Zapisz”", "cover.saved": "Tło zapisane", - "thumbs.modal.title": "Manage topic thumbnails", - "thumbs.modal.no-thumbs": "No thumbnails found.", - "thumbs.modal.resize-note": "Note: This forum is configured to resize topic thumbnails down to a maximum width of %1px", - "thumbs.modal.add": "Add thumbnail", - "thumbs.modal.remove": "Remove thumbnail", - "thumbs.modal.confirm-remove": "Are you sure you want to remove this thumbnail?" + "thumbs.modal.title": "Zarządzaj miniaturkami tematów", + "thumbs.modal.no-thumbs": "Żadne miniaturki nie zostały znalezione", + "thumbs.modal.resize-note": "Note: To forum jest skonfigurowane tak aby zmienić rozmiar miniaturek tematów do maksymalnej szerokości %1px", + "thumbs.modal.add": "Dodaj miniaturkę", + "thumbs.modal.remove": "Usuń miniaturkę", + "thumbs.modal.confirm-remove": "Czy jesteś pewny że chcesz usunąć tą miniaturkę?" } \ No newline at end of file diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json index c876f2185c..c146c517d5 100644 --- a/public/language/pl/notifications.json +++ b/public/language/pl/notifications.json @@ -1,8 +1,8 @@ { "title": "Powiadomienia", "no_notifs": "Nie masz nowych powiadomień", - "see_all": "All notifications", - "mark_all_read": "Mark all read", + "see_all": "Wszystkie powiadomienia", + "mark_all_read": "Zaznacz wszystkie jako przeczytane", "back_to_home": "Wróć do %1", "outgoing_link": "Odnośnik wychodzący", "outgoing_link_message": "Opuszczasz %1", @@ -14,7 +14,7 @@ "topics": "Tematy", "replies": "Odpowiedzi", "chat": "Czaty", - "group-chat": "Group Chats", + "group-chat": "Rozmowy grupowe", "follows": "Obserwuje", "upvote": "Głosy na tak", "new-flags": "Nowe flagi", @@ -47,10 +47,10 @@ "profile-exported": "%1profil wyeksportowany, kliknij tutaj by pobrać", "posts-exported": "%1postów wyeksportowane, kliknij tutaj by pobrać", "uploads-exported": "%1przesłanych plików wyeksportowane, kliknij tutaj by pobrać", - "users-csv-exported": "Users csv exported, click to download", - "post-queue-accepted": "Your queued post has been accepted. Click here to see your post.", - "post-queue-rejected": "Your queued post has been rejected.", - "post-queue-notify": "Queued post received a notification:
\"%1\"", + "users-csv-exported": "Plik csv użytkowników wyeksportowany, kliknij aby pobrać", + "post-queue-accepted": "Twój oczekujący post w kolejce został zaakceptowany. Click tutaj aby go zobaczyć.", + "post-queue-rejected": "Twój post oczekujący w kolejce został odrzucony.", + "post-queue-notify": "Post oczekujący w kolejce otrzymał powiadomienie:
\"%1\"", "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", @@ -65,9 +65,9 @@ "notificationType_post-edit": "Kiedy post jest edytowany w temacie, który obserwujesz", "notificationType_follow": "Kiedy ktoś zacznie Cię obserwować", "notificationType_new-chat": "Kiedy otrzymasz wiadomość na czacie", - "notificationType_new-group-chat": "When you receive a group chat message", + "notificationType_new-group-chat": "Gdy otrzymasz wiadomość na czacie grupowym", "notificationType_group-invite": "Kiedy otrzymasz grupowe zaproszenie", - "notificationType_group-leave": "When a user leaves your group", + "notificationType_group-leave": "Kiedy użytkownik opuszcza Twoją grupę", "notificationType_group-request-membership": "Kiedy ktoś prosi o dołączenie do grupy, którą posiadasz", "notificationType_new-register": "Kiedy ktoś zostaje dodany do kolejki rejestracyjnej", "notificationType_post-queue": "Kiedy nowy post jest kolejkowany", diff --git a/public/language/pl/pages.json b/public/language/pl/pages.json index 8d37dcc4cf..8204caddb5 100644 --- a/public/language/pl/pages.json +++ b/public/language/pl/pages.json @@ -54,7 +54,7 @@ "account/upvoted": "Posty, na które zagłosował %1", "account/downvoted": "Posty, przeciw którym zagłosował %1", "account/best": "Najlepsze posty napisane przez %1", - "account/controversial": "Controversial posts made by %1", + "account/controversial": "Kontrowersyjne posty napisane przez %1", "account/blocks": "Użytkownicy zablokowani przez %1", "account/uploads": "Pliki przesłane przez %1", "account/sessions": "Sesje logowania", diff --git a/public/language/pl/register.json b/public/language/pl/register.json index 85efebfb12..a4e4bcb46c 100644 --- a/public/language/pl/register.json +++ b/public/language/pl/register.json @@ -22,11 +22,11 @@ "registration-queue-auto-approve-time": "Twoje członkostwo na tym forum zostanie w pełni aktywowane w ciągu maksymalnie %1 godzin.", "interstitial.intro": "Do zaktualizowania Twojego konta potrzebne są dodatkowe informacje…", "interstitial.intro-new": "Do utworzenia Twojego konta potrzebne są dodatkowe informacje.", - "interstitial.errors-found": "Please review the entered information:", + "interstitial.errors-found": "Proszę sprawdź wprowadzone informację", "gdpr_agree_data": "Wyrażam zgodę na zbieranie i przetwarzanie moich danych przez tę stronę.", "gdpr_agree_email": "Wyrażam zgodę na otrzymywanie e-maili z podsumowaniami i powiadomieniami od tej strony.", "gdpr_consent_denied": "Musisz wyrazić zgodę na zbieranie/przetwarzanie Twoich danych przez tę stronę oraz na otrzymywanie e-maili.", - "invite.error-admin-only": "Direct user registration has been disabled. Please contact an administrator for more details.", - "invite.error-invite-only": "Direct user registration has been disabled. You must be invited by an existing user in order to access this forum.", - "invite.error-invalid-data": "The registration data received does not correspond to our records. Please contact an administrator for more details" + "invite.error-admin-only": "Bezpośrednia rejestracja użytkownika została wyłączona. Aby uzyskać więcej informacji, skontaktuj się z administratorem.", + "invite.error-invite-only": "Bezpośrednia rejestracja użytkownika została wyłączona. Aby uzyskać dostęp do tego forum, musisz otrzymać zaproszenie od istniejącego użytkownika.", + "invite.error-invalid-data": "Otrzymane dane rejestracyjne nie odpowiadają naszej bazie danych. Aby uzyskać więcej informacji, skontaktuj się z administratorem" } \ No newline at end of file diff --git a/public/language/pl/reset_password.json b/public/language/pl/reset_password.json index 96f703171d..446344767a 100644 --- a/public/language/pl/reset_password.json +++ b/public/language/pl/reset_password.json @@ -7,7 +7,7 @@ "wrong_reset_code.message": "Wprowadzony kod resetujący jest nieprawidłowy. Spróbuj ponownie lub uzyskaj nowy kod.", "new_password": "Nowe hasło", "repeat_password": "Powtórz hasło", - "changing_password": "Changing Password", + "changing_password": "Zmienianie hasła", "enter_email": "Podaj swój adres e-mail, by otrzymać wiadomość z instrukcjami, jak zresetować hasło.", "enter_email_address": "Wpisz swój adres e-mail", "password_reset_sent": "Jeśli podany adres odpowiada istniejącemu kontu użytkownika, to zostanie wysłana wiadomość e-mail dotyczącą resetowania hasła. Pamiętaj, że na minutę zostanie wysłany tylko jeden e-mail.", diff --git a/public/language/pl/success.json b/public/language/pl/success.json index ff998782b4..dcf69790f4 100644 --- a/public/language/pl/success.json +++ b/public/language/pl/success.json @@ -1,7 +1,7 @@ { "success": "Udało się", "topic-post": "Twój post został wysłany.", - "post-queued": "Your post is queued for approval. You will get a notification when it is accepted or rejected.", + "post-queued": "Twój post oczekuje w kolejce na zatwierdzenie. Otrzymasz powiadomienie jego akceptacji lub odrzucenia.", "authentication-successful": "Uwierzytelnienie powiodło się.", "settings-saved": "Ustawienia zostały zapisane." } \ No newline at end of file diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index 79d24cf5de..6c8cb1d96f 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -47,7 +47,7 @@ "restored-by": "Przywrócony przez", "moved-from-by": "Przeniesiony z %1 przez", "queued-by": "Post queued for approval →", - "backlink": "Referenced by", + "backlink": "Odwołuje się do", "forked-by": "Forked by", "bookmark_instructions": "Kliknij tutaj, by powrócić do ostatniego przeczytanego postu w tym temacie.", "flag-post": "Zgłoś ten post", @@ -113,7 +113,7 @@ "bookmark": "Dodaj do zakładek", "bookmarks": "Zakładki", "bookmarks.has_no_bookmarks": "Nie masz jeszcze żadnych postów w zakładkach.", - "copy-permalink": "Copy Permalink", + "copy-permalink": "Skopiuj link", "loading_more_posts": "Załaduj więcej postów", "move_topic": "Przenieś temat", "move_topics": "Przenieś tematy", @@ -141,7 +141,7 @@ "composer.handle_placeholder": "Tutaj wpisz swoje imię/nazwę", "composer.discard": "Odrzuć", "composer.submit": "Utwórz", - "composer.additional-options": "Additional Options", + "composer.additional-options": "Dodatkowe opcje", "composer.schedule": "Schedule", "composer.replying_to": "Odpowiedź na %1", "composer.new_topic": "Nowy temat", @@ -182,7 +182,7 @@ "timeago_earlier": "%1 wcześniej", "first-post": "Pierwszy post", "last-post": "Ostatni 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": "Idź do następnego posta", + "no-more-next-post": "Nie masz więcej postów w tym temacie", "post-quick-reply": "Wyślij szybką odpowiedź" } \ No newline at end of file diff --git a/public/language/pl/user.json b/public/language/pl/user.json index 1f0e05085c..c0a2e33d0b 100644 --- a/public/language/pl/user.json +++ b/public/language/pl/user.json @@ -102,13 +102,13 @@ "has_no_follower": "Ten użytkownik nie ma jeszcze żadnych obserwujących", "follows_no_one": "Ten użytkownik jeszcze nikogo nie obserwuje", "has_no_posts": "Ten użytkownik nic jeszcze nie napisał.", - "has_no_best_posts": "This user does not have any upvoted posts yet.", + "has_no_best_posts": "Ten użytkownik nie ma jeszcze żadnych postów z dodatnią reputacją.", "has_no_topics": "Ten użytkownik nie stworzył jeszcze żadnych tematów.", "has_no_watched_topics": "Ten użytkownik nie obserwuje jeszcze żadnych tematów.", "has_no_ignored_topics": "Użytkownik nie pominął jeszcze żadnego tematu.", "has_no_upvoted_posts": "Ten użytkownik jeszcze nie głosował za w żadnym temacie", "has_no_downvoted_posts": "Ten użytkownik jeszcze nie głosował przeciw w żadnym temacie.", - "has_no_controversial_posts": "This user does not have any downvoted posts yet.", + "has_no_controversial_posts": "Ten użytkownik nie ma jeszcze żadnych postów z ujemną reputacją.", "has_no_blocks": "Nie zablokowałeś jeszcze żadnych użytkowników", "email_hidden": "Adres e-mail ukryty", "hidden": "ukryty", @@ -141,7 +141,7 @@ "homepage": "Strona startowa", "homepage_description": "Wybierz preferowaną stronę startową lub „None”, jeśli chcesz używać strony domyślnej. ", "custom_route": "Niestandardowa strona startowa", - "custom_route_help": "Enter a route name here, without any preceding slash (e.g. \"recent\" or \"category/2/general-discussion\")", + "custom_route_help": "Wprowadź ścieżkę bez poprzedzającego slasha (np: \"recent\" albo \"category/2/general-discussion\")", "sso.title": "Usługi Pojedynczego Logowania", "sso.associated": "Powiązane z", "sso.not-associated": "Kliknij tutaj, aby powiązać z", @@ -191,9 +191,9 @@ "consent.export-uploads-success": "Eksportowanie przesłanych plików. Otrzymasz powiadomienie gdy będą gotowe.", "consent.export_posts": "Eksportuj wpisy (csv)", "consent.export-posts-success": "Eksportowanie postów. Otrzymasz powiadomienie gdy będą gotowe.", - "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.intro": "Proszę wprowadź swój adres email poniżej. To forum używa adresu email do notyfikacji a także do odzyskania konta w razie zapomnienia hasła.", "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": "To pole jest wymagane.", - "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.change-instructions": "Email z unikalnym linkiem zostanie wysłany na wprowadzony adres email. Otwarcie tego linku potwierdzi, że podany adres email należy do Ciebie. W każdej chwili możesz go zmienić w edycji profilu.", + "emailUpdate.password-challenge": "Proszę wprowadź hasło aby potwierdzić, że to konto należy do Ciebie." } \ No newline at end of file diff --git a/public/language/pl/users.json b/public/language/pl/users.json index 88a17e2ebf..8524151a76 100644 --- a/public/language/pl/users.json +++ b/public/language/pl/users.json @@ -5,14 +5,14 @@ "most_flags": "Najwięcej flag", "search": "Szukaj", "enter_username": "Wpisz nazwę użytkownika", - "search-user-for-chat": "Search a user to start chat", + "search-user-for-chat": "Wyszukaj użytkownika by rozpocząć rozmowę", "load_more": "Wczytaj więcej", "users-found-search-took": "Znaleziono %1 użytkownika(-ów). Szukanie zajęło %2 sek.", "filter-by": "Filtruj", "online-only": "Tylko online", "invite": "Zaproś", "prompt-email": "Adresy e-mail:", - "groups-to-join": "Groups to be joined when invite is accepted:", + "groups-to-join": "Przypisane grupy po akceptacji zaproszenia", "invitation-email-sent": "E-mail z zaproszeniem został wysłany do %1", "user_list": "Lista użytkowników", "recent_topics": "Ostatnie tematy", diff --git a/public/language/pt-BR/admin/advanced/cache.json b/public/language/pt-BR/admin/advanced/cache.json index 71cde357a4..ab005b8a1e 100644 --- a/public/language/pt-BR/admin/advanced/cache.json +++ b/public/language/pt-BR/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Cache de Posts", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Cheio", "post-cache-size": "Tamanho do Cache de Posts", "items-in-cache": "Itens no Cache" diff --git a/public/language/pt-BR/admin/settings/post.json b/public/language/pt-BR/admin/settings/post.json index 2f9be57f91..8ecd1f8e69 100644 --- a/public/language/pt-BR/admin/settings/post.json +++ b/public/language/pt-BR/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Desabilitar assinaturas", "signature.no-links": "Desabilitar links em assinaturas", "signature.no-images": "Desabilitar imagens em assinaturas", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Tamanho Máximo de Assinatura", "composer": "Configurações do Compositor", "composer-help": "As seguintes configurações diz respeito à funcionalidade e/ou à aparência do compositor de postagem mostrado\n\t\t\t\taos usuários quando eles criam novos tópicos ou respondem a tópicos existentes.", diff --git a/public/language/pt-BR/admin/settings/reputation.json b/public/language/pt-BR/admin/settings/reputation.json index 85215a47c2..e24a9f4a00 100644 --- a/public/language/pt-BR/admin/settings/reputation.json +++ b/public/language/pt-BR/admin/settings/reputation.json @@ -23,5 +23,9 @@ "flags.limit-per-target-placeholder": "Padrão: 0", "flags.limit-per-target-help": "Quando uma postagem ou usuário é sinalizado várias vezes, cada sinalizador adicional é considerado uma 'reportagem' e adicionado ao sinalizador original. Defina esta opção com um número diferente de zero para limitar o número de relatórios que um item pode receber.", "flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (Set to 0 to disable, default: 0)", - "flags.auto-resolve-on-ban": "Resolver automaticamente todos os tickets de um usuário quando eles são banidos" + "flags.auto-resolve-on-ban": "Resolver automaticamente todos os tickets de um usuário quando eles são banidos", + "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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/pt-PT/admin/advanced/cache.json b/public/language/pt-PT/admin/advanced/cache.json index 684ce7831a..86d9da7df3 100644 --- a/public/language/pt-PT/admin/advanced/cache.json +++ b/public/language/pt-PT/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Cache de Publicações", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Cheio", "post-cache-size": "Tamanho da Cache de Publicações", "items-in-cache": "Itens em Cache" diff --git a/public/language/pt-PT/admin/settings/post.json b/public/language/pt-PT/admin/settings/post.json index df1b464869..a8a416f651 100644 --- a/public/language/pt-PT/admin/settings/post.json +++ b/public/language/pt-PT/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Desativar assinaturas", "signature.no-links": "Desativar links nas assinaturas", "signature.no-images": "Desativar imagens nas assinaturas", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Comprimento Máximo da Assinatura", "composer": "Definições do Editor", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/pt-PT/admin/settings/reputation.json b/public/language/pt-PT/admin/settings/reputation.json index 9395008ec4..67cc261e26 100644 --- a/public/language/pt-PT/admin/settings/reputation.json +++ b/public/language/pt-PT/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/ro/admin/advanced/cache.json b/public/language/ro/admin/advanced/cache.json index 2fd7984883..0148c2d889 100644 --- a/public/language/ro/admin/advanced/cache.json +++ b/public/language/ro/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Post Cache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Full", "post-cache-size": "Post Cache Size", "items-in-cache": "Items in Cache" diff --git a/public/language/ro/admin/settings/post.json b/public/language/ro/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/ro/admin/settings/post.json +++ b/public/language/ro/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/ro/admin/settings/reputation.json b/public/language/ro/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/ro/admin/settings/reputation.json +++ b/public/language/ro/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/ru/admin/advanced/cache.json b/public/language/ru/admin/advanced/cache.json index 23db351585..42f134ea42 100644 --- a/public/language/ru/admin/advanced/cache.json +++ b/public/language/ru/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Кэш сообщений", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "Заполнен на%1%", "post-cache-size": "Размер кэша сообщений", "items-in-cache": "Закешировано элементов" diff --git a/public/language/ru/admin/settings/post.json b/public/language/ru/admin/settings/post.json index a3ebd45ffc..c2e7fdf0d4 100644 --- a/public/language/ru/admin/settings/post.json +++ b/public/language/ru/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Отключить подписи", "signature.no-links": "Отключить ссылки в подписях", "signature.no-images": "Отключить картинки в подписях", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Максимальная длина подписи", "composer": "Настройки редактора", "composer-help": "Эти настройки определяют функциональность и/или внешний вид редактора сообщений", diff --git a/public/language/ru/admin/settings/reputation.json b/public/language/ru/admin/settings/reputation.json index 43753d85f6..0b78ff8a39 100644 --- a/public/language/ru/admin/settings/reputation.json +++ b/public/language/ru/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/rw/admin/advanced/cache.json b/public/language/rw/admin/advanced/cache.json index 2fd7984883..0148c2d889 100644 --- a/public/language/rw/admin/advanced/cache.json +++ b/public/language/rw/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Post Cache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Full", "post-cache-size": "Post Cache Size", "items-in-cache": "Items in Cache" diff --git a/public/language/rw/admin/settings/post.json b/public/language/rw/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/rw/admin/settings/post.json +++ b/public/language/rw/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/rw/admin/settings/reputation.json b/public/language/rw/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/rw/admin/settings/reputation.json +++ b/public/language/rw/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/sc/admin/advanced/cache.json b/public/language/sc/admin/advanced/cache.json index 2fd7984883..0148c2d889 100644 --- a/public/language/sc/admin/advanced/cache.json +++ b/public/language/sc/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Post Cache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Full", "post-cache-size": "Post Cache Size", "items-in-cache": "Items in Cache" diff --git a/public/language/sc/admin/settings/post.json b/public/language/sc/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/sc/admin/settings/post.json +++ b/public/language/sc/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/sc/admin/settings/reputation.json b/public/language/sc/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/sc/admin/settings/reputation.json +++ b/public/language/sc/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/sk/admin/advanced/cache.json b/public/language/sk/admin/advanced/cache.json index 4148012c38..8790e8de60 100644 --- a/public/language/sk/admin/advanced/cache.json +++ b/public/language/sk/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Vyrovnávacia pamäť príspevku", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% plné", "post-cache-size": "Veľkosť vyrovnávacej pamäti príspevku", "items-in-cache": "Položky vo vyrovnávacej pamäti" diff --git a/public/language/sk/admin/settings/post.json b/public/language/sk/admin/settings/post.json index 8c4f8419f0..39d29ac1eb 100644 --- a/public/language/sk/admin/settings/post.json +++ b/public/language/sk/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Zakázať podpisy", "signature.no-links": "Zakázať odkazy v podpisoch", "signature.no-images": "Zakázať obrázky v podpisoch", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximálna dĺžka podpisu", "composer": "Nastavenia kompozície", "composer-help": "Nasledujúce nastavenia kontroluje funkčnosť a/alebo vzhľad zobrazených príspevkov\n\t\t\t\tpre používateľov, ktorí vytvoria novú tému alebo odpovedajú na existujúcu tému.", diff --git a/public/language/sk/admin/settings/reputation.json b/public/language/sk/admin/settings/reputation.json index ca69a2dd8f..e6e298291b 100644 --- a/public/language/sk/admin/settings/reputation.json +++ b/public/language/sk/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/sl/admin/advanced/cache.json b/public/language/sl/admin/advanced/cache.json index a6c69b5944..f286253a5f 100644 --- a/public/language/sl/admin/advanced/cache.json +++ b/public/language/sl/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Predpomnilnik objav", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1%Zasedeno", "post-cache-size": "Velikost predpomnilnika objav", "items-in-cache": "Elementi v predpomnilniku" diff --git a/public/language/sl/admin/settings/post.json b/public/language/sl/admin/settings/post.json index a0ff22173d..dccdf4f9d5 100644 --- a/public/language/sl/admin/settings/post.json +++ b/public/language/sl/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Onemogoči podpise", "signature.no-links": "Onemogoči povezave v podpisih", "signature.no-images": "Onemogoči slike v podpisih", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Največja dolžina podpisa", "composer": "Nastavitve sestavljalnika", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/sl/admin/settings/reputation.json b/public/language/sl/admin/settings/reputation.json index 8938429672..5447842c36 100644 --- a/public/language/sl/admin/settings/reputation.json +++ b/public/language/sl/admin/settings/reputation.json @@ -23,5 +23,9 @@ "flags.limit-per-target-placeholder": "Privzeto: 0", "flags.limit-per-target-help": "Ko je objava ali uporabnik večkrat označen z zastavico, se vsaka dodatna zastavica šteje za & quot;poročilo" in dodana prvotni zastavici. To možnost nastavite na število, različno od nič, da omejite število poročil, ki jih element lahko prejme.", "flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/sq-AL/admin/advanced/cache.json b/public/language/sq-AL/admin/advanced/cache.json index 09ac0af108..371a397b8b 100644 --- a/public/language/sq-AL/admin/advanced/cache.json +++ b/public/language/sq-AL/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Post Cache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Plot ", "post-cache-size": "Post Cache Size", "items-in-cache": "Items in Cache" diff --git a/public/language/sq-AL/admin/settings/post.json b/public/language/sq-AL/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/sq-AL/admin/settings/post.json +++ b/public/language/sq-AL/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/sq-AL/admin/settings/reputation.json b/public/language/sq-AL/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/sq-AL/admin/settings/reputation.json +++ b/public/language/sq-AL/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/sr/admin/advanced/cache.json b/public/language/sr/admin/advanced/cache.json index 2fd7984883..0148c2d889 100644 --- a/public/language/sr/admin/advanced/cache.json +++ b/public/language/sr/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Post Cache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Full", "post-cache-size": "Post Cache Size", "items-in-cache": "Items in Cache" diff --git a/public/language/sr/admin/settings/post.json b/public/language/sr/admin/settings/post.json index beba2775b7..be3cd4df14 100644 --- a/public/language/sr/admin/settings/post.json +++ b/public/language/sr/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Onemogući potpise", "signature.no-links": "Onemogući linkove u potpisima", "signature.no-images": "Onemogući slike u potpisima", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Minimum karaktera u Potpisu", "composer": "Podešavanje Composer-a", "composer-help": "Sledeća podešavanja upravljaju funkcionalnošću i/ili izgledom prikazanom kompozera post-a\n\t\t\t\tprema korisnicima kada prave nove teme, ili odgovaraju na postojeće.", diff --git a/public/language/sr/admin/settings/reputation.json b/public/language/sr/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/sr/admin/settings/reputation.json +++ b/public/language/sr/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/sv/admin/advanced/cache.json b/public/language/sv/admin/advanced/cache.json index 5be0b1378b..ebdd17c2dc 100644 --- a/public/language/sv/admin/advanced/cache.json +++ b/public/language/sv/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Inläggscache", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Full", "post-cache-size": "Storlek på inläggscache", "items-in-cache": "Föremål i cache" diff --git a/public/language/sv/admin/settings/post.json b/public/language/sv/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/sv/admin/settings/post.json +++ b/public/language/sv/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/sv/admin/settings/reputation.json b/public/language/sv/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/sv/admin/settings/reputation.json +++ b/public/language/sv/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/th/admin/advanced/cache.json b/public/language/th/admin/advanced/cache.json index 1c226d0039..c751c880b0 100644 --- a/public/language/th/admin/advanced/cache.json +++ b/public/language/th/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "แคชข้อความ", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "เต็ม %1%", "post-cache-size": "ขนาดแคชของข้อความ", "items-in-cache": "รายการที่ถูกแคช" diff --git a/public/language/th/admin/settings/post.json b/public/language/th/admin/settings/post.json index ab8245738c..57cc855319 100644 --- a/public/language/th/admin/settings/post.json +++ b/public/language/th/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Disable signatures", "signature.no-links": "Disable links in signatures", "signature.no-images": "Disable images in signatures", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maximum Signature Length", "composer": "Composer Settings", "composer-help": "The following settings govern the functionality and/or appearance of the post composer shown\n\t\t\t\tto users when they create new topics, or reply to existing topics.", diff --git a/public/language/th/admin/settings/reputation.json b/public/language/th/admin/settings/reputation.json index ae502f1edd..e790ec094f 100644 --- a/public/language/th/admin/settings/reputation.json +++ b/public/language/th/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/tr/admin/advanced/cache.json b/public/language/tr/admin/advanced/cache.json index 23973b20d7..a3f3620c89 100644 --- a/public/language/tr/admin/advanced/cache.json +++ b/public/language/tr/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "İleti Önbelleği", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% Tam", "post-cache-size": "İleti Önbellek Boyutu", "items-in-cache": "Önbellekteki Öğeler" diff --git a/public/language/tr/admin/settings/post.json b/public/language/tr/admin/settings/post.json index ca8db99a7f..d3577d4d42 100644 --- a/public/language/tr/admin/settings/post.json +++ b/public/language/tr/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "İmzaları devre dışı bırak", "signature.no-links": "İmzalarda linkleri devre dışı bırak", "signature.no-images": "İmzalarda resimleri devre dışı bırak", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Maksimum İmza Uzunluğu", "composer": "Editör Ayarları", "composer-help": "Aşağıdaki ayarlar, yeni konular oluşturduklarında veya mevcut konulara cevap verdiklerinde kullanıcıların \n\t\t\t\tyazı alanının işlevselliğini ve / veya görünümünü yönetmelerini sağlar.", diff --git a/public/language/tr/admin/settings/reputation.json b/public/language/tr/admin/settings/reputation.json index 40442eda6b..797b2e2550 100644 --- a/public/language/tr/admin/settings/reputation.json +++ b/public/language/tr/admin/settings/reputation.json @@ -23,5 +23,9 @@ "flags.limit-per-target-placeholder": "Varsayılan: 0", "flags.limit-per-target-help": "Bir gönderi veya kullanıcı birden çok kez şikayet edildiğinde, her ek şikayet bir \"rapor\" olarak kabul edilir ve orijinal şikayete eklenir. Bir öğenin alabileceği rapor sayısını sınırlamak için bu seçeneği sıfırdan farklı bir sayıya ayarlayın.", "flags.auto-flag-on-downvote-threshold": "Bir iletinin otomatik olarak raporlanması için alması gereken eksi oy sayısı ( Otomatik şikayet özelliğini iptal etmek için buraya 0 giriniz, varsayılan: 0)", - "flags.auto-resolve-on-ban": "Bir kullanıcı forumdan yasaklandığında otomatik olarak şikayetlerini çözülmüş say" + "flags.auto-resolve-on-ban": "Bir kullanıcı forumdan yasaklandığında otomatik olarak şikayetlerini çözülmüş say", + "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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/uk/admin/advanced/cache.json b/public/language/uk/admin/advanced/cache.json index 000509c20f..db008a7eab 100644 --- a/public/language/uk/admin/advanced/cache.json +++ b/public/language/uk/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Кеш постів", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "Заповнений на %1%", "post-cache-size": "Розмір кешу постів", "items-in-cache": "Елементів у кеші" diff --git a/public/language/uk/admin/settings/post.json b/public/language/uk/admin/settings/post.json index ba23e93c33..1a881baf3a 100644 --- a/public/language/uk/admin/settings/post.json +++ b/public/language/uk/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Вимкнути підписи", "signature.no-links": "Вимкнути посилання в підписах", "signature.no-images": "Вимкнути зображення в підписах", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "Максимальна довжина підпису", "composer": "Налаштування редактора", "composer-help": "Ці налаштування керують функціональністю та виглядом редактору постів для користувачів коли вони створюють нові теми або відповідають на існуючі.", diff --git a/public/language/uk/admin/settings/reputation.json b/public/language/uk/admin/settings/reputation.json index 061bba9edb..67de89ab77 100644 --- a/public/language/uk/admin/settings/reputation.json +++ b/public/language/uk/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ 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 f1bad79df9..8a17c99086 100644 --- a/public/language/vi/admin/advanced/cache.json +++ b/public/language/vi/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "Bộ nhớ đệm bài viết", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "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" diff --git a/public/language/vi/admin/settings/post.json b/public/language/vi/admin/settings/post.json index db7602bd43..10cdce3b46 100644 --- a/public/language/vi/admin/settings/post.json +++ b/public/language/vi/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "Tắt chữ ký", "signature.no-links": "Tắt liên kết trong chữ ký", "signature.no-images": "Tắt ảnh trong chữ ký", + "signature.hide-duplicates": "Ẩn chữ ký trùng lặp trong các chủ đề", "signature.max-length": "Chữ Ký Dài Tối Đa", "composer": "Cài Đặt Trình Biên Soạn", "composer-help": "Các cài đặt sau chi phối chức năng và / hoặc giao diện hiển thị của trình soạn bài\n\t\t\t\tngười dùng khi họ tạo chủ đề mới hoặc trả lời các chủ đề hiện có.", diff --git a/public/language/vi/admin/settings/reputation.json b/public/language/vi/admin/settings/reputation.json index fd0751ed51..ba1d868e2b 100644 --- a/public/language/vi/admin/settings/reputation.json +++ b/public/language/vi/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Số phiếu phản đối cho các bài đăng tự động gắn cờ (Đặt thành 0 để tắt, mặc định: 0)", - "flags.auto-resolve-on-ban": "Tự động giải quyết tất cả các vé của người dùng khi họ bị cấm" + "flags.auto-resolve-on-ban": "Tự động giải quyết tất cả các vé của người dùng khi họ bị cấm", + "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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/zh-CN/admin/advanced/cache.json b/public/language/zh-CN/admin/advanced/cache.json index 7ec075ef8c..e829207158 100644 --- a/public/language/zh-CN/admin/advanced/cache.json +++ b/public/language/zh-CN/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "帖子缓存", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% 容量", "post-cache-size": "帖子缓存大小", "items-in-cache": "缓存中的条目数量" diff --git a/public/language/zh-CN/admin/settings/post.json b/public/language/zh-CN/admin/settings/post.json index b5fd5774a5..261645aec1 100644 --- a/public/language/zh-CN/admin/settings/post.json +++ b/public/language/zh-CN/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "禁用签名", "signature.no-links": "禁用签名中的链接", "signature.no-images": "禁用签名中的图片", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "签名字数上限", "composer": "编辑器设置", "composer-help": "以下设置控制所示后期编辑器的功能和/或外观\n\t\t\t\t当用户创建新主题或回复现有主题时。", diff --git a/public/language/zh-CN/admin/settings/reputation.json b/public/language/zh-CN/admin/settings/reputation.json index 0064b05564..fc8d47bdf0 100644 --- a/public/language/zh-CN/admin/settings/reputation.json +++ b/public/language/zh-CN/admin/settings/reputation.json @@ -23,5 +23,9 @@ "flags.limit-per-target-placeholder": "默认：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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/language/zh-TW/admin/advanced/cache.json b/public/language/zh-TW/admin/advanced/cache.json index 7f1b68055f..02f2586f57 100644 --- a/public/language/zh-TW/admin/advanced/cache.json +++ b/public/language/zh-TW/admin/advanced/cache.json @@ -1,5 +1,8 @@ { "post-cache": "貼文快取", + "group-cache": "Group Cache", + "local-cache": "Local Cache", + "object-cache": "Object Cache", "percent-full": "%1% 容量", "post-cache-size": "貼文快取大小", "items-in-cache": "快取中的項目數量" diff --git a/public/language/zh-TW/admin/settings/post.json b/public/language/zh-TW/admin/settings/post.json index 057bfe0e6b..3b3bfd7f10 100644 --- a/public/language/zh-TW/admin/settings/post.json +++ b/public/language/zh-TW/admin/settings/post.json @@ -51,6 +51,7 @@ "signature.disable": "禁用簽名", "signature.no-links": "禁用簽名中的連結", "signature.no-images": "禁用簽名中的圖片", + "signature.hide-duplicates": "Hide duplicate signatures in topics", "signature.max-length": "簽名字數上限", "composer": "編輯器設定", "composer-help": "以下設定控制所示後期編輯器的功能和/或外觀\n\t\t\t\t當使用者建立新主題或回覆現有主題時。", diff --git a/public/language/zh-TW/admin/settings/reputation.json b/public/language/zh-TW/admin/settings/reputation.json index fb44353099..6be88d9e23 100644 --- a/public/language/zh-TW/admin/settings/reputation.json +++ b/public/language/zh-TW/admin/settings/reputation.json @@ -23,5 +23,9 @@ "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.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts (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.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 send to moderators/administrators" } \ No newline at end of file diff --git a/public/openapi/write.yaml b/public/openapi/write.yaml index eb74cef2d9..6f55dbcfc0 100644 --- a/public/openapi/write.yaml +++ b/public/openapi/write.yaml @@ -86,6 +86,8 @@ paths: $ref: 'write/users/uid/emails/email.yaml' /users/{uid}/emails/{email}/confirm: $ref: 'write/users/uid/emails/email/confirm.yaml' + /users/{uid}/exports/{type}: + $ref: 'write/users/uid/exports/type.yaml' /groups/: $ref: 'write/groups.yaml' /groups/{slug}: diff --git a/public/openapi/write/users/uid/exports/type.yaml b/public/openapi/write/users/uid/exports/type.yaml new file mode 100644 index 0000000000..928cb9b8f4 --- /dev/null +++ b/public/openapi/write/users/uid/exports/type.yaml @@ -0,0 +1,85 @@ +head: + tags: + - users + summary: Check if a user's export exists + parameters: + - in: path + name: uid + schema: + type: integer + required: true + description: uid of the user to make the query for + example: 1 + - in: path + name: type + schema: + type: string + required: true + description: The type of export to query + example: posts + responses: + '204': + description: Exported file found. + '404': + description: Exported file not found — this could be because an export has never been generated for this user. +get: + tags: + - users + summary: Download a user's exported data + parameters: + - in: path + name: uid + schema: + type: integer + required: true + description: uid of the user to make the query for + example: 1 + - in: path + name: type + schema: + type: string + required: true + description: The type of export to download + example: posts + responses: + '200': + description: A download containing the requested exported data + '404': + description: Exported file not found — this could be because an export has never been generated for this user. +post: + tags: + - users + summary: Generate a user export + description: | + This operation generates a user export file for later download. + It will return immediately with the `202 Accepted` response code, meaning the request was accepted for processing. + The expected behaviour is for the client to then poll the corresponding `HEAD` method until it returns a `204 No Content` + (or if awaiting a new export, for the `Last-Modified` or `ETag` header to change) + at which point the `GET` method can be called for download. + parameters: + - in: path + name: uid + schema: + type: integer + required: true + description: uid of the user to make the query for + example: 1 + - in: path + name: type + schema: + type: string + required: true + description: The type of export to download + example: posts + responses: + '202': + description: Successfully started generating the requested user export + content: + application/json: + schema: + type: object + properties: + status: + $ref: ../../../../components/schemas/Status.yaml#/Status + response: + type: object \ No newline at end of file diff --git a/public/src/app.js b/public/src/app.js index b81bc59cc4..c116765a6b 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -9,7 +9,6 @@ require('jquery-form'); window.utils = require('./utils'); require('timeago'); -const Visibility = require('visibilityjs'); const Benchpress = require('benchpressjs'); Benchpress.setGlobal('config', config); @@ -19,7 +18,11 @@ require('./ajaxify'); app = window.app || {}; -app.isFocused = true; +Object.defineProperty(app, 'isFocused', { + get() { + return document.visibilityState === 'visible'; + } +}); app.currentRoom = null; app.widgets = {}; app.flags = {}; @@ -95,10 +98,6 @@ if (document.readyState === 'loading') { app.newTopic(); }); - Visibility.change(function (event, state) { - app.isFocused = state === 'visible'; - }); - registerServiceWorker(); require([ diff --git a/public/src/client/account/consent.js b/public/src/client/account/consent.js index a43f29449b..41a3a0c77d 100644 --- a/public/src/client/account/consent.js +++ b/public/src/client/account/consent.js @@ -1,7 +1,7 @@ 'use strict'; -define('forum/account/consent', ['forum/account/header', 'alerts'], function (header, alerts) { +define('forum/account/consent', ['forum/account/header', 'alerts', 'api'], function (header, alerts, api) { const Consent = {}; Consent.init = function () { @@ -17,18 +17,15 @@ define('forum/account/consent', ['forum/account/header', 'alerts'], function (he }); }); - handleExport($('[data-action="export-profile"]'), 'user.exportProfile', '[[user:consent.export-profile-success]]'); - handleExport($('[data-action="export-posts"]'), 'user.exportPosts', '[[user:consent.export-posts-success]]'); - handleExport($('[data-action="export-uploads"]'), 'user.exportUploads', '[[user:consent.export-uploads-success]]'); + handleExport($('[data-action="export-profile"]'), 'profile', '[[user:consent.export-profile-success]]'); + handleExport($('[data-action="export-posts"]'), 'posts', '[[user:consent.export-posts-success]]'); + handleExport($('[data-action="export-uploads"]'), 'uploads', '[[user:consent.export-uploads-success]]'); - function handleExport(el, method, success) { + function handleExport(el, type, success) { el.on('click', function () { - socket.emit(method, { uid: ajaxify.data.uid }, function (err) { - if (err) { - return alerts.error(err); - } + api.post(`/users/${ajaxify.data.uid}/exports/${type}`).then(() => { alerts.success(success); - }); + }).catch(alerts.error); }); } }; diff --git a/public/src/client/account/edit/email.js b/public/src/client/account/edit/email.js deleted file mode 100644 index 32d6fb1d54..0000000000 --- a/public/src/client/account/edit/email.js +++ /dev/null @@ -1,44 +0,0 @@ -'use strict'; - -define('forum/account/edit/email', ['forum/account/header', 'api', 'alerts'], function (header, api, alerts) { - const AccountEditEmail = {}; - - AccountEditEmail.init = function () { - header.init(); - - $('#submitBtn').on('click', function () { - const curPasswordEl = $('#inputCurrentPassword'); - const userData = { - uid: $('#inputUID').val(), - email: $('#inputNewEmail').val(), - password: curPasswordEl.val(), - }; - - if (!userData.email) { - return; - } - - if (userData.email === userData.password) { - curPasswordEl.parents('.control-group').toggleClass('has-error', true); - return alerts.error('[[user:email_same_as_password]]'); - } - - const btn = $(this); - btn.addClass('disabled').find('i').removeClass('hide'); - - api.put('/users/' + userData.uid, userData).then((res) => { - btn.removeClass('disabled').find('i').addClass('hide'); - ajaxify.go('user/' + res.userslug + '/edit'); - }).catch((err) => { - setTimeout(() => { - btn.removeClass('disabled').find('i').addClass('hide'); - alerts.error(err); - }, 300); // for UX: this call is too fast. - }); - - return false; - }); - }; - - return AccountEditEmail; -}); diff --git a/public/src/client/account/edit/password.js b/public/src/client/account/edit/password.js index 85a44e2a36..abbe443e85 100644 --- a/public/src/client/account/edit/password.js +++ b/public/src/client/account/edit/password.js @@ -24,7 +24,7 @@ define('forum/account/edit/password', [ passwordvalid = false; try { - utils.assertPasswordValidity(password.val()); + utils.assertPasswordValidity(password.val(), zxcvbn); if (password.val() === ajaxify.data.username) { throw new Error('[[user:password_same_as_username]]'); diff --git a/public/src/client/register.js b/public/src/client/register.js index 69bd6362f2..7bad263b0a 100644 --- a/public/src/client/register.js +++ b/public/src/client/register.js @@ -2,8 +2,8 @@ define('forum/register', [ - 'translator', 'slugify', 'api', 'bootbox', 'forum/login', 'jquery-form', -], function (translator, slugify, api, bootbox, Login) { + 'translator', 'slugify', 'api', 'bootbox', 'forum/login', 'jquery-form', 'zxcvbn', +], function (translator, slugify, api, bootbox, Login, zxcvbn) { const Register = {}; let validationError = false; const successIcon = ''; @@ -143,7 +143,7 @@ define('forum/register', [ const password_confirm_notify = $('#password-confirm-notify'); try { - utils.assertPasswordValidity(password); + utils.assertPasswordValidity(password, zxcvbn); if (password === $('#username').val()) { throw new Error('[[user:password_same_as_username]]'); diff --git a/public/src/client/reset_code.js b/public/src/client/reset_code.js index a6e5fd0a55..45147ae385 100644 --- a/public/src/client/reset_code.js +++ b/public/src/client/reset_code.js @@ -1,7 +1,7 @@ 'use strict'; -define('forum/reset_code', ['alerts'], function (alerts) { +define('forum/reset_code', ['alerts', 'zxcvbn'], function (alerts, zxcvbn) { const ResetCode = {}; ResetCode.init = function () { @@ -13,7 +13,7 @@ define('forum/reset_code', ['alerts'], function (alerts) { resetEl.on('click', function () { try { - utils.assertPasswordValidity(password.val()); + utils.assertPasswordValidity(password.val(), zxcvbn); if (password.val() !== repeat.val()) { throw new Error('[[reset_password:passwords_do_not_match]]'); diff --git a/public/src/client/topic.js b/public/src/client/topic.js index 0c111bcf7f..f9a8ca05b3 100644 --- a/public/src/client/topic.js +++ b/public/src/client/topic.js @@ -20,6 +20,7 @@ define('forum/topic', [ components, storage, hooks, api, alerts ) { const Topic = {}; + let tid = 0; let currentUrl = ''; $(window).on('action:ajaxify.start', function (ev, data) { @@ -33,14 +34,17 @@ define('forum/topic', [ }); Topic.init = function () { - const tid = ajaxify.data.tid; + const tidChanged = !tid || parseInt(tid, 10) !== parseInt(ajaxify.data.tid, 10); + tid = ajaxify.data.tid; currentUrl = ajaxify.currentPage; hooks.fire('action:topic.loading'); app.enterRoom('topic_' + tid); + if (tidChanged) { + posts.signaturesShown = {}; + } posts.onTopicPageLoad(components.get('post')); - navigator.init('[component="post"]', ajaxify.data.postcount, Topic.toTop, Topic.toBottom, utils.debounce(Topic.navigatorCallback, 500)); postTools.init(tid); @@ -177,6 +181,12 @@ define('forum/topic', [ Topic.applyDropup.call(this); } }); + hooks.onPage('action:topic.tools.load', ({ element }) => { + Topic.applyDropup.call(element.get(0).parentNode); + }); + hooks.onPage('action:post.tools.load', ({ element }) => { + Topic.applyDropup.call(element.get(0).parentNode); + }); } function addRepliesHandler() { diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 28b1119a3f..e9b5602145 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -32,7 +32,6 @@ define('forum/topic/postTools', [ function renderMenu() { $('[component="topic"]').on('show.bs.dropdown', '.moderator-tools', function () { - const self = this; const $this = $(this); const dropdownMenu = $this.find('.dropdown-menu'); if (dropdownMenu.html()) { @@ -50,15 +49,14 @@ define('forum/topic/postTools', [ const html = await app.parseAndTranslate('partials/topic/post-menu-list', data); const clipboard = require('clipboard'); - // eslint-disable-next-line import/no-unresolved - const topic = require('forum/topic'); dropdownMenu.html(html); dropdownMenu.get(0).classList.toggle('hidden', false); - topic.applyDropup.call(self); new clipboard('[data-clipboard-text]'); - hooks.fire('action:post.tools.load'); + hooks.fire('action:post.tools.load', { + element: dropdownMenu, + }); }); }); } diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js index 9c7c7a245d..4e9e8501ae 100644 --- a/public/src/client/topic/posts.js +++ b/public/src/client/topic/posts.js @@ -14,6 +14,8 @@ define('forum/topic/posts', [ ], function (pagination, infinitescroll, postTools, images, navigator, components, translator, hooks, helpers) { const Posts = { }; + Posts.signaturesShown = {}; + Posts.onNewPost = function (data) { if ( !data || @@ -282,6 +284,7 @@ define('forum/topic/posts', [ Posts.onTopicPageLoad = function (posts) { handlePrivateUploads(posts); images.wrapImagesInLinks(posts); + hideDuplicateSignatures(posts); Posts.showBottomPostBar(); posts.find('[component="post/content"] img:not(.not-responsive)').addClass('img-responsive'); Posts.addBlockquoteEllipses(posts); @@ -353,6 +356,20 @@ define('forum/topic/posts', [ }); } + function hideDuplicateSignatures(posts) { + if (ajaxify.data['signatures:hideDuplicates']) { + posts.each((index, el) => { + const signatureEl = $(el).find('[component="post/signature"]'); + const uid = signatureEl.attr('data-uid'); + if (Posts.signaturesShown[uid]) { + signatureEl.addClass('hidden'); + } else { + Posts.signaturesShown[uid] = true; + } + }); + } + } + function removeNecroPostMessages(removedPostEls) { removedPostEls.each((index, el) => { $(`[data-necro-post-index="${$(el).attr('data-index')}"]`).remove(); diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index 403e9abfba..0a6daa1030 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -180,12 +180,15 @@ define('forum/topic/threadTools', [ return; } + dropdownMenu.toggleClass('hidden', true); socket.emit('topics.loadTopicTools', { tid: ajaxify.data.tid, cid: ajaxify.data.cid }, function (err, data) { if (err) { return alerts.error(err); } app.parseAndTranslate('partials/topic/topic-menu-list', data, function (html) { dropdownMenu.html(html); + dropdownMenu.toggleClass('hidden', false); + hooks.fire('action:topic.tools.load', { element: dropdownMenu, }); diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.js index 706c44c6fa..25907fb446 100644 --- a/public/src/modules/helpers.common.js +++ b/public/src/modules/helpers.common.js @@ -196,7 +196,7 @@ module.exports = function (utils, Benchpress, relative_path) { function renderEvents(events) { return events.reduce((html, event) => { - html += `
  • + html += `
  • @@ -216,7 +216,7 @@ module.exports = function (utils, Benchpress, relative_path) { html += ``; if (this.privileges.isAdminOrMod) { - html += ` `; + html += ` `; } return html; diff --git a/public/src/utils.js b/public/src/utils.js index f6a6b31897..03eee8f493 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -3,7 +3,6 @@ 'use strict'; const $ = require('jquery'); -const zxcvbn = require('zxcvbn'); const utils = { ...require('./utils.common') }; @@ -57,7 +56,7 @@ utils.isMobile = function () { }); }; -utils.assertPasswordValidity = (password) => { +utils.assertPasswordValidity = (password, zxcvbn) => { // More checks on top of basic utils.isPasswordValid() if (!utils.isPasswordValid(password)) { throw new Error('[[user:change_password_error]]'); diff --git a/src/api/users.js b/src/api/users.js index abc295acfd..c23f2c04d6 100644 --- a/src/api/users.js +++ b/src/api/users.js @@ -1,6 +1,7 @@ 'use strict'; const validator = require('validator'); +const winston = require('winston'); const db = require('../database'); const user = require('../user'); @@ -441,3 +442,37 @@ usersAPI.changePicture = async (caller, data) => { 'icon:bgColor': data.bgColor, }, ['picture', 'icon:bgColor']); }; + +usersAPI.generateExport = async (caller, { uid, type }) => { + const count = await db.incrObjectField('locks', `export:${uid}${type}`); + if (count > 1) { + throw new Error('[[error:already-exporting]]'); + } + + const child = require('child_process').fork(`./src/user/jobs/export-${type}.js`, [], { + env: process.env, + }); + child.send({ uid }); + child.on('error', async (err) => { + winston.error(err.stack); + await db.deleteObjectField('locks', `export:${uid}${type}`); + }); + child.on('exit', async () => { + await db.deleteObjectField('locks', `export:${uid}${type}`); + const userData = await user.getUserFields(uid, ['username', 'userslug']); + const { displayname } = userData; + const n = await notifications.create({ + bodyShort: `[[notifications:${type}-exported, ${displayname}]]`, + path: `/api/user/${userData.userslug}/export/${type}`, + nid: `${type}:export:${uid}`, + from: uid, + }); + await notifications.push(n, [caller.uid]); + await events.log({ + type: `export:${type}`, + uid: caller.uid, + targetUid: uid, + ip: caller.ip, + }); + }); +}; diff --git a/src/cache/lru.js b/src/cache/lru.js index d0a92c46d5..3434e0773b 100644 --- a/src/cache/lru.js +++ b/src/cache/lru.js @@ -37,12 +37,15 @@ module.exports = function (opts) { cache.enabled = opts.hasOwnProperty('enabled') ? opts.enabled : true; const cacheSet = lruCache.set; - // backwards compatibility + // expose properties while keeping backwards compatibility const propertyMap = new Map([ ['length', 'calculatedSize'], + ['calculatedSize', 'calculatedSize'], ['max', 'max'], ['maxSize', 'maxSize'], ['itemCount', 'size'], + ['size', 'size'], + ['ttl', 'ttl'], ]); propertyMap.forEach((lruProp, cacheProp) => { Object.defineProperty(cache, cacheProp, { diff --git a/src/cache/ttl.js b/src/cache/ttl.js index 3b9d3fee77..be7e795616 100644 --- a/src/cache/ttl.js +++ b/src/cache/ttl.js @@ -13,6 +13,23 @@ module.exports = function (opts) { cache.enabled = opts.hasOwnProperty('enabled') ? opts.enabled : true; const cacheSet = ttlCache.set; + // expose properties + const propertyMap = new Map([ + ['max', 'max'], + ['itemCount', 'size'], + ['size', 'size'], + ['ttl', 'ttl'], + ]); + propertyMap.forEach((ttlProp, cacheProp) => { + Object.defineProperty(cache, cacheProp, { + get: function () { + return ttlCache[ttlProp]; + }, + configurable: true, + enumerable: true, + }); + }); + cache.set = function (key, value, ttl) { if (!cache.enabled) { return; @@ -90,5 +107,13 @@ module.exports = function (opts) { return unCachedKeys; }; + cache.dump = function () { + return Array.from(ttlCache.entries()); + }; + + cache.peek = function (key) { + return ttlCache.get(key, { updateAgeOnGet: false }); + }; + return cache; }; diff --git a/src/controllers/admin/cache.js b/src/controllers/admin/cache.js index 67c9864ae5..6d5c385a22 100644 --- a/src/controllers/admin/cache.js +++ b/src/controllers/admin/cache.js @@ -3,8 +3,9 @@ const cacheController = module.exports; const utils = require('../../utils'); +const plugins = require('../../plugins'); -cacheController.get = function (req, res) { +cacheController.get = async function (req, res) { const postCache = require('../../posts/cache'); const groupCache = require('../../groups').cache; const { objectCache } = require('../../database'); @@ -23,29 +24,33 @@ cacheController.get = function (req, res) { misses: utils.addCommas(String(cache.misses)), hitRatio: ((cache.hits / (cache.hits + cache.misses) || 0)).toFixed(4), enabled: cache.enabled, + ttl: cache.ttl, }; } - - const data = { - postCache: getInfo(postCache), - groupCache: getInfo(groupCache), - localCache: getInfo(localCache), + let caches = { + post: postCache, + group: groupCache, + local: localCache, }; - if (objectCache) { - data.objectCache = getInfo(objectCache); + caches.object = objectCache; + } + caches = await plugins.hooks.fire('filter:admin.cache.get', caches); + for (const [key, value] of Object.entries(caches)) { + caches[key] = getInfo(value); } - res.render('admin/advanced/cache', data); + res.render('admin/advanced/cache', { caches }); }; -cacheController.dump = function (req, res, next) { - const caches = { +cacheController.dump = async function (req, res, next) { + let caches = { post: require('../../posts/cache'), object: require('../../database').objectCache, group: require('../../groups').cache, local: require('../../cache'), }; + caches = await plugins.hooks.fire('filter:admin.cache.get', caches); if (!caches[req.query.name]) { return next(); } diff --git a/src/controllers/admin/groups.js b/src/controllers/admin/groups.js index e4da58a650..1a7dc950c7 100644 --- a/src/controllers/admin/groups.js +++ b/src/controllers/admin/groups.js @@ -9,6 +9,7 @@ const groups = require('../../groups'); const meta = require('../../meta'); const pagination = require('../../pagination'); const events = require('../../events'); +const slugify = require('../../slugify'); const groupsController = module.exports; @@ -31,7 +32,8 @@ groupsController.list = async function (req, res) { }; groupsController.get = async function (req, res, next) { - const groupName = req.params.name; + const slug = slugify(req.params.name); + const groupName = await groups.getGroupNameByGroupSlug(slug); const [groupNames, group] = await Promise.all([ getGroupNames(), groups.get(groupName, { uid: req.uid, truncateUserList: true, userListCount: 20 }), diff --git a/src/controllers/authentication.js b/src/controllers/authentication.js index 10b93e2bf5..2a006b321c 100644 --- a/src/controllers/authentication.js +++ b/src/controllers/authentication.js @@ -339,19 +339,7 @@ authenticationController.doLogin = async function (req, uid) { return; } const loginAsync = util.promisify(req.login).bind(req); - - const { reroll } = req.res.locals; - if (reroll !== false) { - const regenerateSession = util.promisify(req.session.regenerate).bind(req.session); - - const sessionData = { ...req.session }; - await regenerateSession(); - for (const [prop, value] of Object.entries(sessionData)) { - req.session[prop] = value; - } - } - - await loginAsync({ uid: uid }, { keepSessionInfo: true }); + await loginAsync({ uid: uid }, { keepSessionInfo: req.res.locals !== false }); await authenticationController.onSuccessfulLogin(req, uid); }; diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js index 164dd5f0fa..dcb6f55e4c 100644 --- a/src/controllers/helpers.js +++ b/src/controllers/helpers.js @@ -434,11 +434,22 @@ helpers.formatApiResponse = async (statusCode, res, payload) => { res.set('cache-control', 'private'); } + let code = 'ok'; + let message = 'OK'; + switch (statusCode) { + case 202: + code = 'accepted'; + message = 'Accepted'; + break; + + case 204: + code = 'no-content'; + message = 'No Content'; + break; + } + res.status(statusCode).json({ - status: { - code: 'ok', - message: 'OK', - }, + status: { code, message }, response: payload || {}, }); } else if (payload instanceof Error) { diff --git a/src/controllers/topics.js b/src/controllers/topics.js index 807e546a00..a92570b8c8 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -88,6 +88,7 @@ topicsController.get = async function getTopic(req, res, next) { topicData['reputation:disabled'] = meta.config['reputation:disabled']; topicData['downvote:disabled'] = meta.config['downvote:disabled']; topicData['feeds:disableRSS'] = meta.config['feeds:disableRSS'] || 0; + topicData['signatures:hideDuplicates'] = meta.config['signatures:hideDuplicates']; topicData.bookmarkThreshold = meta.config.bookmarkThreshold; topicData.necroThreshold = meta.config.necroThreshold; topicData.postEditDuration = meta.config.postEditDuration; diff --git a/src/controllers/user.js b/src/controllers/user.js index 08772117a1..df71aa0b18 100644 --- a/src/controllers/user.js +++ b/src/controllers/user.js @@ -1,6 +1,7 @@ 'use strict'; const path = require('path'); +const winston = require('winston'); const user = require('../user'); const privileges = require('../privileges'); @@ -90,7 +91,10 @@ userController.exportProfile = async function (req, res, next) { sendExport(`${res.locals.uid}_profile.json`, 'application/json', res, next); }; +// DEPRECATED; Remove in NodeBB v3.0.0 function sendExport(filename, type, res, next) { + winston.warn(`[users/export] Access via page API is deprecated, use GET /api/v3/users/:uid/exports/:type instead.`); + res.sendFile(filename, { root: path.join(__dirname, '../../build/export'), headers: { diff --git a/src/controllers/write/users.js b/src/controllers/write/users.js index ddf1b5b93c..56d547aaaf 100644 --- a/src/controllers/write/users.js +++ b/src/controllers/write/users.js @@ -2,6 +2,9 @@ const util = require('util'); const nconf = require('nconf'); +const path = require('path'); +const crypto = require('crypto'); +const fs = require('fs').promises; const db = require('../../database'); const api = require('../../api'); @@ -15,6 +18,12 @@ const helpers = require('../helpers'); const Users = module.exports; +const exportMetadata = new Map([ + ['posts', ['csv', 'text/csv']], + ['uploads', ['zip', 'application/zip']], + ['profile', ['json', 'application/json']], +]); + const hasAdminPrivilege = async (uid, privilege) => { const ok = await privileges.admin.can(`admin:${privilege}`, uid); if (!ok) { @@ -296,3 +305,52 @@ Users.confirmEmail = async (req, res) => { helpers.formatApiResponse(404, res); } }; + +const prepareExport = async (req, res) => { + const [extension] = exportMetadata.get(req.params.type); + const filename = `${req.params.uid}_${req.params.type}.${extension}`; + try { + const stat = await fs.stat(path.join(__dirname, '../../../build/export', filename)); + const modified = new Date(stat.mtimeMs); + res.set('Last-Modified', modified.toUTCString()); + res.set('ETag', `"${crypto.createHash('md5').update(String(stat.mtimeMs)).digest('hex')}"`); + res.status(204); + return true; + } catch (e) { + res.status(404); + return false; + } +}; + +Users.checkExportByType = async (req, res) => { + await prepareExport(req, res); + res.end(); +}; + +Users.getExportByType = async (req, res) => { + const [extension, mime] = exportMetadata.get(req.params.type); + const filename = `${req.params.uid}_${req.params.type}.${extension}`; + + const exists = await prepareExport(req, res); + if (!exists) { + return res.end(); + } + + res.status(200); + res.sendFile(filename, { + root: path.join(__dirname, '../../../build/export'), + headers: { + 'Content-Type': mime, + 'Content-Disposition': `attachment; filename=${filename}`, + }, + }, (err) => { + if (err) { + throw err; + } + }); +}; + +Users.generateExportsByType = async (req, res) => { + await api.users.generateExport(req, req.params); + helpers.formatApiResponse(202, res); +}; diff --git a/src/flags.js b/src/flags.js index cca52bb292..7d8b5e43aa 100644 --- a/src/flags.js +++ b/src/flags.js @@ -679,7 +679,10 @@ Flags.update = async function (flagId, uid, changeset) { } else { tasks.push(db.sortedSetAdd(`flags:byState:${changeset[prop]}`, now, flagId)); tasks.push(db.sortedSetRemove(`flags:byState:${current[prop]}`, flagId)); - if (changeset[prop] === 'resolved' || changeset[prop] === 'rejected') { + if (changeset[prop] === 'resolved' && meta.config['flags:actionOnResolve'] === 'rescind') { + tasks.push(notifications.rescind(`flag:${current.type}:${current.targetId}`)); + } + if (changeset[prop] === 'rejected' && meta.config['flags:actionOnReject'] === 'rescind') { tasks.push(notifications.rescind(`flag:${current.type}:${current.targetId}`)); } } diff --git a/src/routes/write/users.js b/src/routes/write/users.js index 6f22fa6166..980eccc8a2 100644 --- a/src/routes/write/users.js +++ b/src/routes/write/users.js @@ -51,6 +51,10 @@ function authenticatedRoutes() { setupApiRoute(router, 'get', '/:uid/emails/:email', [...middlewares, middleware.assert.user], controllers.write.users.getEmail); setupApiRoute(router, 'post', '/:uid/emails/:email/confirm', [...middlewares, middleware.assert.user], controllers.write.users.confirmEmail); + setupApiRoute(router, 'head', '/:uid/exports/:type', [...middlewares, middleware.assert.user, middleware.checkAccountPermissions], controllers.write.users.checkExportByType); + setupApiRoute(router, 'get', '/:uid/exports/:type', [...middlewares, middleware.assert.user, middleware.checkAccountPermissions], controllers.write.users.getExportByType); + setupApiRoute(router, 'post', '/:uid/exports/:type', [...middlewares, middleware.assert.user, middleware.checkAccountPermissions], controllers.write.users.generateExportsByType); + // Shorthand route to access user routes by userslug router.all('/+bySlug/:userslug*?', [], controllers.write.users.redirectBySlug); } diff --git a/src/socket.io/admin/cache.js b/src/socket.io/admin/cache.js index 9188ac8f5b..1d382720f5 100644 --- a/src/socket.io/admin/cache.js +++ b/src/socket.io/admin/cache.js @@ -3,26 +3,30 @@ const SocketCache = module.exports; const db = require('../../database'); +const plugins = require('../../plugins'); SocketCache.clear = async function (socket, data) { - if (data.name === 'post') { - require('../../posts/cache').reset(); - } else if (data.name === 'object' && db.objectCache) { - db.objectCache.reset(); - } else if (data.name === 'group') { - require('../../groups').cache.reset(); - } else if (data.name === 'local') { - require('../../cache').reset(); + let caches = { + post: require('../../posts/cache'), + object: db.objectCache, + group: require('../../groups').cache, + local: require('../../cache'), + }; + caches = await plugins.hooks.fire('filter:admin.cache.get', caches); + if (!caches[data.name]) { + return; } + caches[data.name].reset(); }; SocketCache.toggle = async function (socket, data) { - const caches = { + let caches = { post: require('../../posts/cache'), object: db.objectCache, group: require('../../groups').cache, local: require('../../cache'), }; + caches = await plugins.hooks.fire('filter:admin.cache.get', caches); if (!caches[data.name]) { return; } diff --git a/src/socket.io/user/profile.js b/src/socket.io/user/profile.js index 2dcbb1af03..20a869056c 100644 --- a/src/socket.io/user/profile.js +++ b/src/socket.io/user/profile.js @@ -1,14 +1,12 @@ 'use strict'; -const winston = require('winston'); - const user = require('../../user'); -const events = require('../../events'); -const notifications = require('../../notifications'); const privileges = require('../../privileges'); -const db = require('../../database'); const plugins = require('../../plugins'); +const sockets = require('..'); +const api = require('../../api'); + module.exports = function (SocketUser) { SocketUser.updateCover = async function (socket, data) { if (!socket.uid) { @@ -64,6 +62,8 @@ module.exports = function (SocketUser) { }; async function doExport(socket, data, type) { + sockets.warnDeprecated(socket, 'POST /api/v3/users/:uid/exports/:type'); + if (!socket.uid) { throw new Error('[[error:invalid-uid]]'); } @@ -74,36 +74,6 @@ module.exports = function (SocketUser) { await user.isAdminOrSelf(socket.uid, data.uid); - const count = await db.incrObjectField('locks', `export:${data.uid}${type}`); - if (count > 1) { - throw new Error('[[error:already-exporting]]'); - } - - const child = require('child_process').fork(`./src/user/jobs/export-${type}.js`, [], { - env: process.env, - }); - child.send({ uid: data.uid }); - child.on('error', async (err) => { - winston.error(err.stack); - await db.deleteObjectField('locks', `export:${data.uid}${type}`); - }); - child.on('exit', async () => { - await db.deleteObjectField('locks', `export:${data.uid}${type}`); - const userData = await user.getUserFields(data.uid, ['username', 'userslug']); - const { displayname } = userData; - const n = await notifications.create({ - bodyShort: `[[notifications:${type}-exported, ${displayname}]]`, - path: `/api/user/${userData.userslug}/export/${type}`, - nid: `${type}:export:${data.uid}`, - from: data.uid, - }); - await notifications.push(n, [socket.uid]); - await events.log({ - type: `export:${type}`, - uid: socket.uid, - targetUid: data.uid, - ip: socket.ip, - }); - }); + api.users.generateExport(socket, { type, ...data }); } }; diff --git a/src/views/admin/advanced/cache.tpl b/src/views/admin/advanced/cache.tpl index 3ac75a0d38..c5a2dc2143 100644 --- a/src/views/admin/advanced/cache.tpl +++ b/src/views/admin/advanced/cache.tpl @@ -2,118 +2,43 @@
    + {{{each caches}}}
    -
    [[admin/advanced/cache:post-cache]]
    +
    [[admin/advanced/cache:{@key}-cache]]
    -
    +
    - {postCache.length} / {postCache.maxSize}
    + {{{if ../length}}}{../length}{{{else}}}{../itemCount}{{{end}}} / {{{if ../max}}}{../max}{{{else}}}{../maxSize}{{{end}}}
    -
    - [[admin/advanced/cache:percent-full, {postCache.percentFull}]] +
    + [[admin/advanced/cache:percent-full, {../percentFull}]]
    - {postCache.hits}
    - {postCache.misses}
    - {postCache.hitRatio}
    - + {../hits}
    + {../misses}
    + {../hitRatio}
    + {{{if ../ttl}}} {../ttl}
    {{{end}}} + {{{if (@key == "post")}}}
    -
    - - -
    -
    -
    - - -
    -
    -
    Object Cache
    -
    -
    - -
    - {objectCache.itemCount} / {objectCache.max}
    -
    -
    - [[admin/advanced/cache:percent-full, {objectCache.percentFull}]] -
    -
    - - {objectCache.hits}
    - {objectCache.misses}
    - {objectCache.hitRatio}
    - - -
    -
    -
    - - -
    -
    -
    Group Cache
    -
    -
    - -
    - {groupCache.itemCount} / {groupCache.max}
    - -
    -
    - [[admin/advanced/cache:percent-full, {groupCache.percentFull}]] -
    -
    - - {groupCache.hits}
    - {groupCache.misses}
    - {groupCache.hitRatio}
    - - -
    -
    -
    - -
    -
    -
    Local Cache
    -
    -
    - -
    - {localCache.itemCount} / {localCache.max}
    - -
    -
    - [[admin/advanced/cache:percent-full, {localCache.percentFull}]] -
    -
    - - {localCache.hits}
    - {localCache.misses}
    - {localCache.hitRatio}
    - - + {{{end}}} + +
    + {{{end}}} +
    diff --git a/src/views/admin/manage/groups.tpl b/src/views/admin/manage/groups.tpl index 03a38ec656..25f7b835b5 100644 --- a/src/views/admin/manage/groups.tpl +++ b/src/views/admin/manage/groups.tpl @@ -21,7 +21,7 @@ - {groups.displayName} ({groups.memberCount}) + {groups.displayName} ({groups.memberCount})

    {groups.description}

    diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl index 6c018ec974..8e8d2e76bc 100644 --- a/src/views/admin/settings/post.tpl +++ b/src/views/admin/settings/post.tpl @@ -259,6 +259,12 @@ [[admin/settings/post:signature.no-images]]
    +
    + +
    diff --git a/src/views/admin/settings/reputation.tpl b/src/views/admin/settings/reputation.tpl index e82843d8f3..c9ac7d3acc 100644 --- a/src/views/admin/settings/reputation.tpl +++ b/src/views/admin/settings/reputation.tpl @@ -103,6 +103,26 @@
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +