From cecd8e1373543a5ff1f664e9710ca8bdfb759bc9 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Sat, 6 Jul 2024 09:18:44 +0000 Subject: [PATCH 01/21] Latest translations and fallbacks --- public/language/pt-BR/admin/admin.json | 14 ++-- public/language/pt-BR/category.json | 10 +-- public/language/pt-BR/topic.json | 88 +++++++++++++------------- public/language/th/notifications.json | 8 +-- public/language/th/post-queue.json | 4 +- 5 files changed, 62 insertions(+), 62 deletions(-) diff --git a/public/language/pt-BR/admin/admin.json b/public/language/pt-BR/admin/admin.json index 313e12bbe3..c52000cfe7 100644 --- a/public/language/pt-BR/admin/admin.json +++ b/public/language/pt-BR/admin/admin.json @@ -4,15 +4,15 @@ "acp-title": "%1 | Painel de Controle Administrativo do NodeBB", "settings-header-contents": "Conteúdos", - "changes-saved": "Changes Saved", - "changes-saved-message": "Your changes to the NodeBB configuration have been saved.", + "changes-saved": "Alterações Salvas", + "changes-saved-message": "Suas alterações na configuração do NodeBB foram salvas.", "changes-not-saved": "Alterações não foram Salvas", "changes-not-saved-message": "O NodeBB encontrou um problema ao salvar suas alterações. (%1)", - "save-changes": "Save changes", + "save-changes": "Salvar Alterações", "min": "Min:", "max": "Max:", - "view": "View", - "edit": "Edit", - "add": "Add", - "select-icon": "Select Icon" + "view": "Visualizar", + "edit": "Editar", + "add": "Adicionar", + "select-icon": "Selecionar Ícone" } \ No newline at end of file diff --git a/public/language/pt-BR/category.json b/public/language/pt-BR/category.json index f2badb6332..bad6452df6 100644 --- a/public/language/pt-BR/category.json +++ b/public/language/pt-BR/category.json @@ -10,15 +10,15 @@ "watch": "Acompanhar", "ignore": "Ignorar", "watching": "Acompanhar", - "tracking": "Tracking", + "tracking": "Rastreando", "not-watching": "Não Acompanhar", "ignoring": "Ignorar", - "watching.description": "Notify me of new topics.
Show topics in unread & recent", - "tracking.description": "Shows topics in unread & recent", + "watching.description": "Me notificar de novas respostas.Mostrar tópico em não-lidos.", + "tracking.description": "Mostrar tópicos em não-lidos e recentes", "not-watching.description": "Não mostrar tópicos em não-lidos, mostrar em recentes", - "ignoring.description": "Do not show topics in unread & recent", + "ignoring.description": "Não mostrar tópicos em \"não lidos\" e \"recentes\"", "watching.message": "Agora, você está acompanhando as novidades desta categoria e todas as suas subcategorias", - "tracking.message": "You are now tracking updates from this category and all subcategories", + "tracking.message": "Agora, você está acompanhando as novidades desta categoria e todas as suas subcategorias", "notwatching.message": "Agora, você não está acompanhando as novidades nem desta categoria e nem de suas subcategorias", "ignoring.message": "Agora, você está ignorando as novidades desta categorias e de todas as suas subcategorias", "watched-categories": "Categorias acompanhadas", diff --git a/public/language/pt-BR/topic.json b/public/language/pt-BR/topic.json index 5413887db1..1bf116660c 100644 --- a/public/language/pt-BR/topic.json +++ b/public/language/pt-BR/topic.json @@ -15,14 +15,14 @@ "replies-to-this-post": "%1 Respostas", "one-reply-to-this-post": "1 Resposta", "last-reply-time": "Última resposta", - "reply-options": "Reply options", + "reply-options": "Opções de resposta", "reply-as-topic": "Responder como tópico", "guest-login-reply": "Entre para responder", "login-to-view": "🔒 Entre para ver", "edit": "Editar", "delete": "Deletar", - "delete-event": "Delete Event", - "delete-event-confirm": "Are you sure you want to delete this event?", + "delete-event": "Deletar Evento", + "delete-event-confirm": "Tem certeza que deseja deletar este evento?", "purge": "Expurgar", "restore": "Restaurar", "move": "Mover", @@ -38,42 +38,42 @@ "deleted": "Deleted", "moved": "Movido", "moved-from": "Movido de %1", - "copy-code": "Copy Code", + "copy-code": "Copiar Código", "copy-ip": "Copiar IP", "ban-ip": "Banir IP", "view-history": "Histórico de Edição", - "wrote-ago": "wrote ", - "wrote-on": "wrote on ", - "replied-to-user-ago": "replied to %3 ", - "replied-to-user-on": "replied to %3 on ", - "user-locked-topic-ago": "%1 locked this topic %2", - "user-locked-topic-on": "%1 locked this topic on %2", - "user-unlocked-topic-ago": "%1 unlocked this topic %2", - "user-unlocked-topic-on": "%1 unlocked this topic on %2", - "user-pinned-topic-ago": "%1 pinned this topic %2", - "user-pinned-topic-on": "%1 pinned this topic on %2", - "user-unpinned-topic-ago": "%1 unpinned this topic %2", - "user-unpinned-topic-on": "%1 unpinned this topic on %2", - "user-deleted-topic-ago": "%1 deleted this topic %2", - "user-deleted-topic-on": "%1 deleted this topic on %2", - "user-restored-topic-ago": "%1 restored this topic %2", - "user-restored-topic-on": "%1 restored this topic on %2", - "user-moved-topic-from-ago": "%1 moved this topic from %2 %3", - "user-moved-topic-from-on": "%1 moved this topic from %2 on %3", - "user-queued-post-ago": "%1 queued post for approval %3", - "user-queued-post-on": "%1 queued post for approval on %3", - "user-referenced-topic-ago": "%1 referenced this topic %3", - "user-referenced-topic-on": "%1 referenced this topic on %3", - "user-forked-topic-ago": "%1 forked this topic %3", - "user-forked-topic-on": "%1 forked this topic on %3", + "wrote-ago": "escreveu ", + "wrote-on": "escreveu em ", + "replied-to-user-ago": "respondeu para %3 ", + "replied-to-user-on": "respondeu para %3 on ", + "user-locked-topic-ago": "%1 trancou este tópico %2", + "user-locked-topic-on": "%1 trancou este tópico em %2", + "user-unlocked-topic-ago": "%1 destrancou este tópico %2", + "user-unlocked-topic-on": "%1 destrancou este tópico em %2", + "user-pinned-topic-ago": "%1 fixou este tópico %2", + "user-pinned-topic-on": "%1 fixou este tópico em %2", + "user-unpinned-topic-ago": "%1 desfixou este tópico %2", + "user-unpinned-topic-on": "%1 desfixou este tópico em %2", + "user-deleted-topic-ago": "%1 deletou este tópico %2", + "user-deleted-topic-on": "%1 deletou este tópico em %2", + "user-restored-topic-ago": "%1 restaurou este tópico %2", + "user-restored-topic-on": "%1 restaurou este tópico em %2", + "user-moved-topic-from-ago": "%1 moveu este tópico de %2 %3", + "user-moved-topic-from-on": "%1 moveu este tópico de %2 em %3", + "user-queued-post-ago": "%1 enfileirou post para aprovação %3", + "user-queued-post-on": "%1 enfileirou post para aprovação em %3", + "user-referenced-topic-ago": "%1 referenciou este tópico %3", + "user-referenced-topic-on": "%1 referenciou este tópico em %3", + "user-forked-topic-ago": "%1 ramificou este tópico %3", + "user-forked-topic-on": "%1 ramificou este tópico em %3", "bookmark-instructions": "Clique aqui para retornar ao último post lido neste tópico.", "flag-post": "Marque este post", "flag-user": "Marque este usuário", "already-flagged": "Já marcado", "view-flag-report": "Ver Relatório da Sinalização", "resolve-flag": "Resolver marcação", - "merged-message": "Este tópico foi fundido com %2", - "forked-message": "This topic was forked from %2", + "merged-message": "Este tópico foi mesclado com %2", + "forked-message": "Este tópico foi ramificado de %2", "deleted-message": "Este tópico foi deletado. Apenas usuários com privilégios de moderação de tópico podem vê-lo.", "following-topic.message": "Agora você receberá notificações quando alguém responder este tópico.", "not-following-topic.message": "Você verá este tópico na lista de tópicos não-lidos, mas você não receberá notificações quando alguém postar no tópico.", @@ -105,7 +105,7 @@ "thread-tools.change-owner": "Trocar proprietário", "thread-tools.select-category": "Escolha a Categoria", "thread-tools.fork": "Ramificar Tópico", - "thread-tools.tag": "Tag Topic", + "thread-tools.tag": "Definir Tag", "thread-tools.delete": "Deletar Tópico", "thread-tools.delete-posts": "Deletar Posts", "thread-tools.delete-confirm": "Tem certeza que deseja excluir este tópico?", @@ -114,7 +114,7 @@ "thread-tools.purge": "Expurgar Tópico", "thread-tools.purge-confirm": "Tem certeza que deseja expurgar este tópico?", "thread-tools.merge-topics": "Mesclar Tópicos", - "thread-tools.merge": "Merge Topic", + "thread-tools.merge": "Mesclar Tópico", "topic-move-success": "Este tópico será movido para '% 1' em breve. Clique aqui para desfazer.", "topic-move-multiple-success": "Esses tópicos serão movidos para '%1' em breve. Clique aqui para desfazer.", "topic-move-all-success": "Todos os tópicos serão movidos para '%1' em breve. Clique aqui para desfazer.", @@ -132,7 +132,7 @@ "bookmark": "Favorito", "bookmarks": "Favoritos", "bookmarks.has-no-bookmarks": "Você ainda não adicionou quaisquer posts aos favoritos.", - "copy-permalink": "Copy Permalink", + "copy-permalink": "Copiar Permalink", "loading-more-posts": "Carregando Mais Posts", "move-topic": "Mover Tópico", "move-topics": "Mover Tópicos", @@ -140,7 +140,7 @@ "post-moved": "Post movido!", "fork-topic": "Ramificar Tópico", "enter-new-topic-title": "Insira o novo título do tópico", - "fork-topic-instruction": "Click the posts you want to fork, enter a title for the new topic and click fork topic", + "fork-topic-instruction": "Click nos posts que você quer ramificar, entre um novo título para o novo tópico e click em ramificar tópico", "fork-no-pids": "Nenhum post selecionado!", "no-posts-selected": "Nenhum post selecionado!", "x-posts-selected": "%1 post(s) selecionados", @@ -155,19 +155,19 @@ "merge-new-title-for-topic": "Novo título para o tópico", "topic-id": "ID do Tópico", "move-posts-instruction": "Clique nas postagens que deseja mover e insira um ID de tópico ou vá para o tópico de destino", - "move-topic-instruction": "Select the target category and then click move", + "move-topic-instruction": "Selecione a categoria destino e click em mover", "change-owner-instruction": "Clique na postagem que você quer associar a outro usuário", "composer.title-placeholder": "Digite aqui o título para o seu tópico...", "composer.handle-placeholder": "Digite seu nome/usuário aqui", - "composer.hide": "Hide", + "composer.hide": "Esconder", "composer.discard": "Descartar", "composer.submit": "Enviar", - "composer.additional-options": "Additional Options", - "composer.post-later": "Post Later", + "composer.additional-options": "Opções Adicionais", + "composer.post-later": "Postar mais tarde", "composer.schedule": "Agendar", "composer.replying-to": "Respondendo para %1", "composer.new-topic": "Novo Tópico", - "composer.editing-in": "Editing post in %1", + "composer.editing-in": "Editando post em %1", "composer.uploading": "enviando...", "composer.thumb-url-label": "Cole o endereço de um thumbnail para o tópico", "composer.thumb-title": "Adicionar um thumbnail para este tópico", @@ -186,7 +186,7 @@ "recently-created": "Recently Created", "most-votes": "Mais Votados", "most-posts": "Mais Postagens", - "most-views": "Most Views", + "most-views": "Mais Views", "stale.title": "Criar um novo tópico ao invés disso?", "stale.warning": "O tópico que você está respondendo é bem antigo. Você gostaria de criar um novo tópico ao invés disso, e referenciá-lo em sua resposta?", "stale.create": "Criar um novo tópico", @@ -206,12 +206,12 @@ "timeago-earlier": "%1 mais cedo", "first-post": "Primeiro post", "last-post": "Último post", - "go-to-my-next-post": "Go to my next post", - "no-more-next-post": "You don't have more posts in this topic", + "go-to-my-next-post": "Ir para o meu próximo post", + "no-more-next-post": "Você não tem mais posts nesse tópico", "open-composer": "Open composer", "post-quick-reply": "Resposta rápida", - "navigator.index": "Post %1 of %2", - "navigator.unread": "%1 unread", + "navigator.index": "Post %1 de %2", + "navigator.unread": "%1 não lida", "upvote-post": "Upvote post", "downvote-post": "Downvote post", "post-tools": "Post tools", diff --git a/public/language/th/notifications.json b/public/language/th/notifications.json index d2760ba136..7a54603bc7 100644 --- a/public/language/th/notifications.json +++ b/public/language/th/notifications.json @@ -52,10 +52,10 @@ "user-posted-to-multiple": "%1, %2 และอีก %3 คน ได้โพสต์คำตอบไปยัง %4", "user-posted-topic": "%1ได้โพสต์กระทู้ใหม่ : %2", "user-edited-post": "%1 ได้แก้ไขโพสต์ใน %2", - "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", - "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", - "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", - "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag": "%1 ได้โพสต์ %2 (ติดแท็ก %3)", + "user-posted-topic-with-tag-dual": "%1 ได้โพสต์ %2 (ติดแท็ก %3 และ %4)", + "user-posted-topic-with-tag-triple": "%1 ได้โพสต์ %2 (ติดแท็ก %3, %4 และ %5)", + "user-posted-topic-with-tag-multiple": "%1 ได้โพสต์ %2 (ติดแท็ก %3)", "user-posted-topic-in-category": "%1 ได้โพสต์กระทู้ใหม่ใน %2", "user-started-following-you": "%1 ได้เริ่มติดตามคุณ", "user-started-following-you-dual": "%1และ%2ได้เริ่มติดตามคุณ", diff --git a/public/language/th/post-queue.json b/public/language/th/post-queue.json index 55cfccc3ed..21320ff288 100644 --- a/public/language/th/post-queue.json +++ b/public/language/th/post-queue.json @@ -26,7 +26,7 @@ "notify-user": "แจ้งเตือนผู้ใช้งาน", "confirm-reject": "คุณต้องการปฏิเสธโพสต์นี้หรือไม่?", "confirm-remove": "คุณต้องการลบโพสต์นี้หรือไม่??", - "bulk-actions": "คำสั่งทีละมากๆ", + "bulk-actions": "จัดการทีละมากๆ", "accept-all": "ยอมรับทั้งหมด", "accept-selected": "ยอมรับที่เลือก", "reject-all": "ปฏิเสธทั้งหมด", @@ -39,5 +39,5 @@ "remove-selected-confirm": "คุณต้องการลบโพสต์ที่เลือกจำนวน %1 โพสต์หรือไม่?", "bulk-accept-success": "%1 โพสต์ถูกยอมรับ", "bulk-reject-success": "%1 โพสต์ถูกปฏิเสธ", - "links-in-this-post": "Links in this post" + "links-in-this-post": "ลิงก์ในโพสต์นี้" } \ No newline at end of file From 324610deb7bb62495ff8b26e0434292a3c5c5202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 6 Jul 2024 18:57:58 -0400 Subject: [PATCH 02/21] chore: up persona --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index b1dc0ba5db..05be3af0a0 100644 --- a/install/package.json +++ b/install/package.json @@ -107,7 +107,7 @@ "nodebb-theme-harmony": "1.2.63", "nodebb-theme-lavender": "7.1.8", "nodebb-theme-peace": "2.2.6", - "nodebb-theme-persona": "13.3.24", + "nodebb-theme-persona": "13.3.25", "nodebb-widget-essentials": "7.0.16", "nodemailer": "6.9.13", "nprogress": "0.2.0", From 548e5b4545c20d91f47b9e2429b3248f39f388eb Mon Sep 17 00:00:00 2001 From: SinisterSpatula <49018201+SinisterSpatula@users.noreply.github.com> Date: Sat, 6 Jul 2024 21:38:36 -0500 Subject: [PATCH 03/21] Update crop_picture.tpl (#12676) Fixes an issue where clicking flip vertical the first time has no effect on the image. --- src/views/modals/crop_picture.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modals/crop_picture.tpl b/src/views/modals/crop_picture.tpl index a36f32d2b2..519bacd5ec 100644 --- a/src/views/modals/crop_picture.tpl +++ b/src/views/modals/crop_picture.tpl @@ -23,7 +23,7 @@
- +
From 8ea9b4a8f3c848a4e4b5df7cec9d2523ef26ee63 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 6 Jul 2024 22:38:45 -0400 Subject: [PATCH 04/21] chore(deps): update dependency mocha to v10.6.0 (#12672) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 7f645d6457..162f9d047e 100644 --- a/install/package.json +++ b/install/package.json @@ -165,7 +165,7 @@ "husky": "8.0.3", "jsdom": "24.1.0", "lint-staged": "15.2.7", - "mocha": "10.5.2", + "mocha": "10.6.0", "mocha-lcov-reporter": "1.3.0", "mockdate": "3.0.5", "nyc": "17.0.0", From 18f9b1d61fc9928292e8fb7216b721420ca604f0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 6 Jul 2024 22:38:55 -0400 Subject: [PATCH 05/21] fix(deps): update dependency ace-builds to v1.35.2 (#12669) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 162f9d047e..86020e30d8 100644 --- a/install/package.json +++ b/install/package.json @@ -35,7 +35,7 @@ "@isaacs/ttlcache": "1.4.1", "@nodebb/spider-detector": "2.0.3", "@popperjs/core": "2.11.8", - "ace-builds": "1.35.1", + "ace-builds": "1.35.2", "archiver": "7.0.1", "async": "3.2.5", "autoprefixer": "10.4.19", From 088217f3b2ec792b473839f02d1afe8e5aaac619 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 6 Jul 2024 22:43:59 -0400 Subject: [PATCH 06/21] fix(deps): update dependency esbuild to v0.23.0 (#12668) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 86020e30d8..75e0a4e91e 100644 --- a/install/package.json +++ b/install/package.json @@ -64,7 +64,7 @@ "csrf-sync": "4.0.3", "daemon": "1.1.0", "diff": "5.2.0", - "esbuild": "0.21.5", + "esbuild": "0.23.0", "express": "4.19.2", "express-session": "1.18.0", "express-useragent": "1.0.15", From 540a05d29327e8f9f97e07808da82903614cdd26 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 6 Jul 2024 22:46:34 -0400 Subject: [PATCH 07/21] fix(deps): update dependency @fontsource/inter to v5.0.19 (#12677) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 75e0a4e91e..e08b4dcf34 100644 --- a/install/package.json +++ b/install/package.json @@ -29,7 +29,7 @@ }, "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", - "@fontsource/inter": "5.0.18", + "@fontsource/inter": "5.0.19", "@fontsource/poppins": "5.0.14", "@fortawesome/fontawesome-free": "6.5.2", "@isaacs/ttlcache": "1.4.1", From d39c05ab22faca8b140d94dc848b604e8bf46a32 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 6 Jul 2024 22:46:49 -0400 Subject: [PATCH 08/21] fix(deps): update dependency webpack-merge to v6 (#12670) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index e08b4dcf34..32bfc40d05 100644 --- a/install/package.json +++ b/install/package.json @@ -144,7 +144,7 @@ "tough-cookie": "4.1.4", "validator": "13.12.0", "webpack": "5.92.1", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "winston": "3.13.0", "workerpool": "9.1.3", "xml": "1.0.1", From 48bd55191117ebdf2e996e0a98e6ec94ddee38e9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 7 Jul 2024 02:14:55 -0400 Subject: [PATCH 09/21] fix(deps): update dependency rimraf to v5.0.8 (#12680) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 32bfc40d05..bbad575d50 100644 --- a/install/package.json +++ b/install/package.json @@ -121,7 +121,7 @@ "progress-webpack-plugin": "1.0.16", "prompt": "1.3.0", "ioredis": "5.4.1", - "rimraf": "5.0.7", + "rimraf": "5.0.8", "rss": "1.2.2", "rtlcss": "4.1.1", "sanitize-html": "2.13.0", From 871367c113ea61a562e8e37f2d92a4f58db67543 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 7 Jul 2024 02:15:07 -0400 Subject: [PATCH 10/21] fix(deps): update dependency nodebb-theme-persona to v13.3.25 (#12679) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index bbad575d50..15838d778e 100644 --- a/install/package.json +++ b/install/package.json @@ -107,7 +107,7 @@ "nodebb-theme-harmony": "1.2.63", "nodebb-theme-lavender": "7.1.8", "nodebb-theme-peace": "2.2.6", - "nodebb-theme-persona": "13.3.24", + "nodebb-theme-persona": "13.3.25", "nodebb-widget-essentials": "7.0.16", "nodemailer": "6.9.14", "nprogress": "0.2.0", From fcfe1f5719a8230144738e907bc277506e80b18f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 7 Jul 2024 02:15:28 -0400 Subject: [PATCH 11/21] fix(deps): update dependency lru-cache to v10.3.1 (#12678) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 15838d778e..35e187d09a 100644 --- a/install/package.json +++ b/install/package.json @@ -86,7 +86,7 @@ "jsonwebtoken": "9.0.2", "lodash": "4.17.21", "logrotate-stream": "0.2.9", - "lru-cache": "10.3.0", + "lru-cache": "10.3.1", "mime": "3.0.0", "mkdirp": "3.0.1", "mongodb": "6.8.0", From 335bc685bcaf690951b76b945f82a8a68b6a5ba6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 15:07:16 -0400 Subject: [PATCH 12/21] fix(deps): update dependency rimraf to v5.0.9 (#12684) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 35e187d09a..37c5d96829 100644 --- a/install/package.json +++ b/install/package.json @@ -121,7 +121,7 @@ "progress-webpack-plugin": "1.0.16", "prompt": "1.3.0", "ioredis": "5.4.1", - "rimraf": "5.0.8", + "rimraf": "5.0.9", "rss": "1.2.2", "rtlcss": "4.1.1", "sanitize-html": "2.13.0", From 38e9bbba5d29e8e35aa456529116254465119b0d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 15:07:25 -0400 Subject: [PATCH 13/21] fix(deps): update dependency lru-cache to v10.4.3 (#12681) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 37c5d96829..9bea179014 100644 --- a/install/package.json +++ b/install/package.json @@ -86,7 +86,7 @@ "jsonwebtoken": "9.0.2", "lodash": "4.17.21", "logrotate-stream": "0.2.9", - "lru-cache": "10.3.1", + "lru-cache": "10.4.3", "mime": "3.0.0", "mkdirp": "3.0.1", "mongodb": "6.8.0", From 1087d95ca6ec2f9df72ac0905b4579264a953bc2 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Wed, 10 Jul 2024 09:19:11 +0000 Subject: [PATCH 14/21] Latest translations and fallbacks --- public/language/es/admin/admin.json | 2 +- public/language/es/rewards.json | 2 +- public/language/vi/admin/manage/users.json | 6 +++--- public/language/vi/admin/settings/post.json | 6 +++--- public/language/vi/admin/settings/reputation.json | 14 +++++++------- public/language/vi/admin/settings/user.json | 6 +++--- public/language/vi/aria.json | 2 +- public/language/vi/flags.json | 2 +- public/language/vi/global.json | 6 +++--- public/language/vi/notifications.json | 2 +- public/language/vi/pages.json | 2 +- public/language/vi/social.json | 4 ++-- public/language/vi/topic.json | 2 +- public/language/vi/user.json | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/public/language/es/admin/admin.json b/public/language/es/admin/admin.json index e869a52da7..9e1c619891 100644 --- a/public/language/es/admin/admin.json +++ b/public/language/es/admin/admin.json @@ -1,5 +1,5 @@ { - "alert.confirm-rebuild-and-restart": "¿Está seguro que desea reconstruir y reiniciar NodeBB?", + "alert.confirm-rebuild-and-restart": "Are you sure you wish to rebuild and restart NodeBB?", "alert.confirm-restart": "¿Está seguro que desea reiniciar NodeBB?", "acp-title": "%1 | Panel de control de administrador NodeBB", diff --git a/public/language/es/rewards.json b/public/language/es/rewards.json index f923cf1500..57578aca4a 100644 --- a/public/language/es/rewards.json +++ b/public/language/es/rewards.json @@ -1,5 +1,5 @@ { - "awarded-x-reputation": "You have been awarded %1 reputation", + "awarded-x-reputation": "Has sido premiado", "awarded-group-membership": "You have been added to the group %1", "essentials/user.reputation-conditional-value": "(Reputation %1 %2)", diff --git a/public/language/vi/admin/manage/users.json b/public/language/vi/admin/manage/users.json index dde0a303f2..3312b1fbe8 100644 --- a/public/language/vi/admin/manage/users.json +++ b/public/language/vi/admin/manage/users.json @@ -121,7 +121,7 @@ "alerts.email-sent-to": "Email mời đã được gửi đến %1", "alerts.x-users-found": "Tìm được %1 người dùng (%2 giây)", "alerts.select-a-single-user-to-change-email": "Chọn một người dùng để thay đổi email", - "export": "Export", + "export": "Xuất", "export-users-fields-title": "Select CSV Fields", "export-field-email": "Email", "export-field-username": "Username", @@ -140,8 +140,8 @@ "export-field-website": "Website", "export-field-location": "Location", "export-field-birthday": "Birthday", - "export-field-signature": "Signature", - "export-field-aboutme": "About Me", + "export-field-signature": "Chữ ký", + "export-field-aboutme": "Thông Tin Cá Nhân", "export-users-started": "Xuất người dùng dưới dạng csv, quá trình này có thể mất một lúc. Bạn sẽ nhận được thông báo khi hoàn tất.", "export-users-completed": "Đã xuất người dùng ra csv, bấm vào đây tải xuống.", diff --git a/public/language/vi/admin/settings/post.json b/public/language/vi/admin/settings/post.json index 6c8b908d96..5ff52c725a 100644 --- a/public/language/vi/admin/settings/post.json +++ b/public/language/vi/admin/settings/post.json @@ -4,11 +4,11 @@ "sorting.post-default": "Sắp Xếp Bài Đăng Mặc Định", "sorting.oldest-to-newest": "Cũ nhất đến Mới nhất", "sorting.newest-to-oldest": "Mới nhất đến Cũ nhất", - "sorting.recently-replied": "Recently Replied", - "sorting.recently-created": "Recently Created", + "sorting.recently-replied": "Trả Lời Gần Đây", + "sorting.recently-created": "Đã Tạo Gần Đây", "sorting.most-votes": "Nhiều Bình Chọn", "sorting.most-posts": "Nhiều Bài Đăng", - "sorting.most-views": "Most Views", + "sorting.most-views": "Xem Nhiều", "sorting.topic-default": "Sắp Xếp Chủ Đề Mặc Định", "length": "Độ Dài Bài Đăng", "post-queue": "Xếp Hàng Bài Đăng", diff --git a/public/language/vi/admin/settings/reputation.json b/public/language/vi/admin/settings/reputation.json index 9ff408d767..fce2ef1d48 100644 --- a/public/language/vi/admin/settings/reputation.json +++ b/public/language/vi/admin/settings/reputation.json @@ -2,10 +2,10 @@ "reputation": "Cài Đặt Đánh Giá Uy Tín", "disable": "Tắt Hệ Thống Đánh Giá Uy Tín", "disable-down-voting": "Tắt Phản Đối", - "vote-visibility": "Vote visibility", - "vote-visibility-all": "Everyone can see votes", - "vote-visibility-loggedin": "Only logged in users can see votes", - "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", + "vote-visibility": "Hiển thị phiếu bầu", + "vote-visibility-all": "Mọi người đều có thể xem phiếu bầu", + "vote-visibility-loggedin": "Chỉ người dùng đã đăng nhập mới có thể xem phiếu bầu", + "vote-visibility-privileged": "Chỉ những người dùng đặc quyền như quản trị viên và người kiểm duyệt mới có thể xem phiếu bầu", "thresholds": "Ngưỡng hoạt động", "min-rep-upvote": "Uy tín tối thiểu để ủng hộ bài đăng", "upvotes-per-day": "Số phiếu ủng hộ mỗi ngày (đặt thành 0 để có số phiếu ủng hộ không giới hạn)", @@ -26,11 +26,11 @@ "flags.limit-per-target": "Số lần tối đa nội dung nào đó có thể được gắn cờ", "flags.limit-per-target-placeholder": "Mặc định: 0", "flags.limit-per-target-help": "Khi một bài đăng hoặc người dùng bị gắn cờ nhiều lần, mỗi cờ bổ sung được coi là một "báo cáo" và được thêm vào cờ gốc. Đặt tùy chọn này thành một số khác 0 để giới hạn số lượng báo cáo mà một mục có thể nhận được.", - "flags.limit-post-flags-per-day": "Maximum number of times a user can flag posts in a day", + "flags.limit-post-flags-per-day": "Số lần tối đa người dùng có thể gắn cờ bài đăng trong một ngày", "flags.limit-post-flags-per-day-help": "Đặt là 0 để tắt, (mặc định: 10)", - "flags.limit-user-flags-per-day": "Maximum number of times a user can flag users in a day", + "flags.limit-user-flags-per-day": "Số lần tối đa người dùng có thể gắn cờ người dùng trong một ngày", "flags.limit-user-flags-per-day-help": "Đặt là 0 để tắt, (mặc định: 10)", - "flags.auto-flag-on-downvote-threshold": "Number of downvotes to auto flag posts", + "flags.auto-flag-on-downvote-threshold": "Số lượt phản đối đối với bài đăng tự động gắn cờ", "flags.auto-flag-on-downvote-threshold-help": "Đặt là 0 để tắt, (mặc định: 0)", "flags.auto-resolve-on-ban": "Tự động giải quyết tất cả các yêu cầu của người dùng khi họ bị cấm", "flags.action-on-resolve": "Làm như sau khi một gắn cờ được giải quyết", diff --git a/public/language/vi/admin/settings/user.json b/public/language/vi/admin/settings/user.json index a6c88151fc..8a9e49c924 100644 --- a/public/language/vi/admin/settings/user.json +++ b/public/language/vi/admin/settings/user.json @@ -83,9 +83,9 @@ "categoryWatchState.notwatching": "Không Xem", "categoryWatchState.ignoring": "Bỏ Qua", "restrictions-new": "New User Restrictions", - "restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted", - "restrictions.seconds-between-new": "Seconds between posts for new users", - "restrictions.seconds-before-new": "Seconds before a new user can make their first post", + "restrictions.rep-threshold": "Ngưỡng uy tín trước khi những hạn chế này được dỡ bỏ", + "restrictions.seconds-between-new": "Giây giữa các bài viết cho người dùng mới", + "restrictions.seconds-before-new": "Số giây trước khi người dùng mới có thể đăng bài đầu tiên của họ", "restrictions.seconds-edit-after-new": "Number of seconds a post remains editable for new users (set to 0 to disable)", "restrictions.milliseconds-between-messages": "Time between chat messages for new users (ms)", "restrictions.groups-exempt-from-new-user-restrictions": "Select groups that should be exempt from the new user restrictions" diff --git a/public/language/vi/aria.json b/public/language/vi/aria.json index 1dfdfd3889..7965d69f01 100644 --- a/public/language/vi/aria.json +++ b/public/language/vi/aria.json @@ -3,6 +3,6 @@ "topic-sort-option": "Tùy chọn sắp xếp chủ đề, %1", "user-avatar-for": "User avatar for %1", "user-watched-tags": "User watched tags", - "delete-upload-button": "Delete upload button", + "delete-upload-button": "Xóa nút tải lên", "group-page-link-for": "Group page link for %1" } \ No newline at end of file diff --git a/public/language/vi/flags.json b/public/language/vi/flags.json index 9ab84ccb33..8e73d13368 100644 --- a/public/language/vi/flags.json +++ b/public/language/vi/flags.json @@ -12,7 +12,7 @@ "report-added": "Đã thêm", "report-rescinded": "Đã hủy bỏ", "target-purged": "Nội dung mà cờ này đề cập đến đã bị xóa và không còn nữa.", - "target-aboutme-empty": "Người dùng này không có "Giới Thiệu Về Tôi" set.", + "target-aboutme-empty": "Người dùng này không có "Giới Thiệu Bản Thân".", "graph-label": "Cờ Hàng Ngày", "quick-filters": "Bộ Lọc Nhanh", diff --git a/public/language/vi/global.json b/public/language/vi/global.json index 8226db6116..33ffd71199 100644 --- a/public/language/vi/global.json +++ b/public/language/vi/global.json @@ -76,7 +76,7 @@ "x-votes": "%1 bình chọn", "voters": "Người Bình Chọn", "upvoters": "Người Ủng Hộ", - "upvoted": "Đã Ủng Hộ", + "upvoted": "Đã ủng hộ", "downvoters": "Người phản đối", "downvoted": "Đã phản đối", "views": "Lượt xem", @@ -84,7 +84,7 @@ "reputation": "Uy tín", "lastpost": "Bài viết cuối cùng", "firstpost": "Bài viết đầu tiên", - "about": "About", + "about": "Thông tin", "read-more": "Đọc thêm", "more": "Xem thêm", "none": "Trống", @@ -140,7 +140,7 @@ "edited": "Đã Sửa", "disabled": "Đã tắt", "select": "Chọn", - "selected": "Selected", + "selected": "Đã chọn", "copied": "Đã sao chép", "user-search-prompt": "Nhập để tìm kiếm thành viên", "hidden": "Ẩn", diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json index 8ded5e79dd..e12c3a5a2c 100644 --- a/public/language/vi/notifications.json +++ b/public/language/vi/notifications.json @@ -52,7 +52,7 @@ "user-posted-to-multiple": "%1, %2 và %3 người khác đã đăng trả lời đến: %4", "user-posted-topic": "%1 đã đăng một chủ đề mới: %2", "user-edited-post": "%1 đã chỉnh sửa một bài đăng trong %2", - "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag": "%1 đã đăng %2 (đã gắn thẻ %3)", "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", diff --git a/public/language/vi/pages.json b/public/language/vi/pages.json index ce064852f2..e21e6ba0d8 100644 --- a/public/language/vi/pages.json +++ b/public/language/vi/pages.json @@ -57,7 +57,7 @@ "account/upvoted": "Bài đăng được %1 ủng hộ", "account/downvoted": "Bài viết bị %1 phản đối", "account/best": "Bài viết hay nhất thuộc về %1", - "account/controversial": "Các bài đăng gây tranh cãi được thực hiện bởi %1", + "account/controversial": "Bài đăng gây tranh cãi của %1", "account/blocks": "Người dùng bị chặn vì %1", "account/uploads": "Tải lên bởi %1", "account/sessions": "Phiên Đăng Nhập", diff --git a/public/language/vi/social.json b/public/language/vi/social.json index 6017a94dfc..02b0446c1d 100644 --- a/public/language/vi/social.json +++ b/public/language/vi/social.json @@ -7,6 +7,6 @@ "sign-up-with-google": "Đăng ký với Google", "log-in-with-facebook": "Đăng nhập bằng Facebook", "continue-with-facebook": "Tiếp tục với Facebook", - "sign-in-with-linkedin": "Sign in with LinkedIn", - "sign-up-with-linkedin": "Sign up with LinkedIn" + "sign-in-with-linkedin": "Đăng nhập với LinkedIn", + "sign-up-with-linkedin": "Đăng ký với LinkedIn" } \ No newline at end of file diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json index 0a0b846779..c796043639 100644 --- a/public/language/vi/topic.json +++ b/public/language/vi/topic.json @@ -35,7 +35,7 @@ "pinned": "Đã ghim", "pinned-with-expiry": "Được ghim cho đến %1", "scheduled": "Lên kế hoạch", - "deleted": "Deleted", + "deleted": "Đã xóa", "moved": "Chuyển đi", "moved-from": "Đã chuyển từ %1", "copy-code": "Sao Chép Mã", diff --git a/public/language/vi/user.json b/public/language/vi/user.json index e60f715ac5..2439d0eef8 100644 --- a/public/language/vi/user.json +++ b/public/language/vi/user.json @@ -166,7 +166,7 @@ "info.latest-flags": "Gắn cờ mới nhất", "info.profile": "Hồ sơ", "info.post": "Bài viết", - "info.view-flag": "View flag", + "info.view-flag": "Xem cờ", "info.reported-by": "Báo cáo bởi:", "info.no-flags": "Không Tìm Thấy Bài Bị Gắn Cờ", "info.ban-history": "Lịch Sử Cấm Gần Đây", From 5678430e969db006bfa1460d27bbecf01481f305 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 22:26:46 -0400 Subject: [PATCH 15/21] fix(deps): update dependency winston to v3.13.1 (#12690) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 9bea179014..433e040d31 100644 --- a/install/package.json +++ b/install/package.json @@ -145,7 +145,7 @@ "validator": "13.12.0", "webpack": "5.92.1", "webpack-merge": "6.0.1", - "winston": "3.13.0", + "winston": "3.13.1", "workerpool": "9.1.3", "xml": "1.0.1", "xregexp": "5.1.1", From 500304739ea453203f26b8740cb734cec129933c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 22:26:54 -0400 Subject: [PATCH 16/21] fix(deps): update dependency sass to v1.77.8 (#12687) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 433e040d31..8a4bb2bd7a 100644 --- a/install/package.json +++ b/install/package.json @@ -125,7 +125,7 @@ "rss": "1.2.2", "rtlcss": "4.1.1", "sanitize-html": "2.13.0", - "sass": "1.77.6", + "sass": "1.77.8", "semver": "7.6.2", "serve-favicon": "2.5.0", "sharp": "0.32.6", From 39bcc9033d3232b305d928618e44cc202e0ffc33 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 22:34:08 -0400 Subject: [PATCH 17/21] chore(deps): update dependency sass-embedded to v1.77.8 (#12691) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 8a4bb2bd7a..3be0167835 100644 --- a/install/package.json +++ b/install/package.json @@ -172,7 +172,7 @@ "smtp-server": "3.13.4" }, "optionalDependencies": { - "sass-embedded": "1.77.5" + "sass-embedded": "1.77.8" }, "resolutions": { "*/jquery": "3.7.1" From 710bf2f8233110a134aaf1dd7d3746cdf2dbb7dd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 22:34:17 -0400 Subject: [PATCH 18/21] fix(deps): update dependency webpack to v5.93.0 (#12692) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 3be0167835..8f3f94b7a4 100644 --- a/install/package.json +++ b/install/package.json @@ -143,7 +143,7 @@ "toobusy-js": "0.5.1", "tough-cookie": "4.1.4", "validator": "13.12.0", - "webpack": "5.92.1", + "webpack": "5.93.0", "webpack-merge": "6.0.1", "winston": "3.13.1", "workerpool": "9.1.3", From 85f066ec1b4f058312c820aa3d4a960ca71f1b99 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Sun, 14 Jul 2024 09:18:50 +0000 Subject: [PATCH 19/21] Latest translations and fallbacks --- .../language/zh-CN/admin/advanced/events.json | 8 +-- public/language/zh-CN/admin/dashboard.json | 2 +- public/language/zh-CN/admin/manage/users.json | 24 ++++----- .../zh-CN/admin/settings/navigation.json | 2 +- .../zh-CN/admin/settings/reputation.json | 10 ++-- public/language/zh-CN/flags.json | 2 +- public/language/zh-CN/notifications.json | 50 +++++++++---------- public/language/zh-CN/post-queue.json | 4 +- public/language/zh-CN/rewards.json | 4 +- 9 files changed, 53 insertions(+), 53 deletions(-) diff --git a/public/language/zh-CN/admin/advanced/events.json b/public/language/zh-CN/admin/advanced/events.json index b6c3eba1c4..9c9a9bce50 100644 --- a/public/language/zh-CN/admin/advanced/events.json +++ b/public/language/zh-CN/admin/advanced/events.json @@ -9,9 +9,9 @@ "filter-type": "事件类型", "filter-start": "开始时间", "filter-end": "结束时间", - "filter-user": "Filter by User", - "filter-user.placeholder": "Type user name to filter...", - "filter-group": "Filter by Group", - "filter-group.placeholder": "Type group name to filter...", + "filter-user": "按用户过滤", + "filter-user.placeholder": "输入用户名以过滤", + "filter-group": "按用户群组过滤", + "filter-group.placeholder": "输入群组名以过滤", "filter-per-page": "每页" } \ No newline at end of file diff --git a/public/language/zh-CN/admin/dashboard.json b/public/language/zh-CN/admin/dashboard.json index 5cea605a5c..c32f5ee429 100644 --- a/public/language/zh-CN/admin/dashboard.json +++ b/public/language/zh-CN/admin/dashboard.json @@ -95,7 +95,7 @@ "expand-analytics": "展开统计数据", "clear-search-history": "清空搜索历史", "clear-search-history-confirm": "您确定您要删除搜索历史吗？", - "search-term": "Term", + "search-term": "内容", "search-count": "计数", "view-all": "浏览全部" } diff --git a/public/language/zh-CN/admin/manage/users.json b/public/language/zh-CN/admin/manage/users.json index e474cc27d3..95d4388e59 100644 --- a/public/language/zh-CN/admin/manage/users.json +++ b/public/language/zh-CN/admin/manage/users.json @@ -4,21 +4,21 @@ "edit": "操作", "make-admin": "设为管理", "remove-admin": "取消管理员", - "change-email": "Change Email", + "change-email": "更改Email地址", "new-email": "New Email", "validate-email": "验证邮箱", "send-validation-email": "发送验证邮件", - "change-password": "Change Password", + "change-password": "更改密码", "password-reset-email": "发送密码重置邮件", "force-password-reset": "强制密码重置 & 登录用户已退出", - "ban": "Ban", - "ban-users": "Ban User(s)", + "ban": "封禁", + "ban-users": "封禁用户", "temp-ban": "暂时封禁用户", "unban": "解禁用户", "reset-lockout": "重设锁定", "reset-flags": "重设举报", - "delete": "Delete", - "delete-users": "Delete User(s)", + "delete": "删除", + "delete-users": "删除用户", "delete-content": "删除用户内容", "purge": "删除用户和内容", "download-csv": "下载CSV", @@ -86,7 +86,7 @@ "alerts.button-ban-x": "封禁 %1 名用户", "alerts.unban-success": "用户已解封!", "alerts.lockout-reset-success": "锁定已重置！", - "alerts.password-change-success": "Password(s) changed!", + "alerts.password-change-success": "密码已更改", "alerts.flag-reset-success": "举报已重置！", "alerts.no-remove-yourself-admin": "您无法撤销自己的管理员身份！", "alerts.make-admin-success": "此用户已成为管理员", @@ -112,7 +112,7 @@ "alerts.create": "创建用户", "alerts.button-create": "创建", "alerts.button-cancel": "取消", - "alerts.button-change": "Change", + "alerts.button-change": "更改", "alerts.error-passwords-different": "两次输入的密码必须相同！", "alerts.error-x": "错误

%1

", "alerts.create-success": "用户已创建！", @@ -120,8 +120,8 @@ "alerts.prompt-email": "邮件：", "alerts.email-sent-to": "已发送邀请给 %1", "alerts.x-users-found": "找到 %1 位用户（耗时 %2 秒）", - "alerts.select-a-single-user-to-change-email": "Select a single user to change email", - "export": "Export", + "alerts.select-a-single-user-to-change-email": "选择单个用户以更改其Email", + "export": "导出", "export-users-fields-title": "选择CSV文件", "export-field-email": "邮件", "export-field-username": "用户名", @@ -146,6 +146,6 @@ "export-users-started": "导出用户为 csv，这可能需要一些时间。当导出完成时你会收到通知。", "export-users-completed": "用户列表已被导出为 CSV 文件，点击以下载。", "email": "Email", - "password": "Password", - "manage": "Manage" + "password": "密码", + "manage": "管理" } \ No newline at end of file diff --git a/public/language/zh-CN/admin/settings/navigation.json b/public/language/zh-CN/admin/settings/navigation.json index b0b0d94ed7..172877bc3a 100644 --- a/public/language/zh-CN/admin/settings/navigation.json +++ b/public/language/zh-CN/admin/settings/navigation.json @@ -10,7 +10,7 @@ "id": "ID：可选", "properties": "属性：", - "show-to-groups": "Show to Groups:", + "show-to-groups": "向以下群组展示", "open-new-window": "在新窗口中打开", "dropdown": "下拉列表", "dropdown-placeholder": "将你的下拉菜单项目放在下面，即：
<li><a class="dropdown-item" href="https://myforum.com">Link 1</a></li>", diff --git a/public/language/zh-CN/admin/settings/reputation.json b/public/language/zh-CN/admin/settings/reputation.json index 1b0cd612ea..892a9ca2e1 100644 --- a/public/language/zh-CN/admin/settings/reputation.json +++ b/public/language/zh-CN/admin/settings/reputation.json @@ -2,10 +2,10 @@ "reputation": "声望设置", "disable": "禁用声望系统", "disable-down-voting": "禁用 踩", - "vote-visibility": "Vote visibility", - "vote-visibility-all": "Everyone can see votes", - "vote-visibility-loggedin": "Only logged in users can see votes", - "vote-visibility-privileged": "Only privileged users like admins & moderators can see votes", + "vote-visibility": "投票可见性", + "vote-visibility-all": "所有人可见", + "vote-visibility-loggedin": "仅登录用户可见", + "vote-visibility-privileged": "仅特定用户（例如管理员与版主）可见", "thresholds": "操作限制", "min-rep-upvote": "顶帖子 需要的最低声望", "upvotes-per-day": "每天顶的次数（设置为0则表示无限制）", @@ -27,7 +27,7 @@ "flags.limit-per-target-placeholder": "默认：0", "flags.limit-per-target-help": "当一个帖子或用户被举报不止一次时，每个额外的举报会被认为是一个“报告”并附加到原来的举报中。设置此选项为非零的数以限制一个帖子或用户能被举报的次数。", "flags.limit-post-flags-per-day": "用户每日最多举报帖子次数", - "flags.limit-post-flags-per-day-help": "设置为0表示禁止（默认：10）", + "flags.limit-post-flags-per-day-help": "设置为0表示禁用（默认：10）", "flags.limit-user-flags-per-day": "用户每日可以举报人数", "flags.limit-user-flags-per-day-help": "设置为0表示禁止（默认：10）", "flags.auto-flag-on-downvote-threshold": "被踩多少次数自动转为举报帖子", diff --git a/public/language/zh-CN/flags.json b/public/language/zh-CN/flags.json index 9f215e5643..3a27c1461a 100644 --- a/public/language/zh-CN/flags.json +++ b/public/language/zh-CN/flags.json @@ -90,6 +90,6 @@ "bulk-actions": "批量操作", "bulk-resolve": "处理举报", "bulk-success": "已更新%1个举报", - "flagged-timeago": "Flagged ", + "flagged-timeago": "标记", "auto-flagged": "【自动举报】收到 %1 个踩" } \ No newline at end of file diff --git a/public/language/zh-CN/notifications.json b/public/language/zh-CN/notifications.json index 95432182e8..94b7181c53 100644 --- a/public/language/zh-CN/notifications.json +++ b/public/language/zh-CN/notifications.json @@ -25,42 +25,42 @@ "my-flags": "指派举报给我", "bans": "封禁", "new-message-from": "来自 %1 的新消息", - "new-messages-from": "%1 new messages from %2", - "new-message-in": "New message in %1", - "new-messages-in": "%1 new messages in %2", - "user-posted-in-public-room": "%1 wrote in %3", - "user-posted-in-public-room-dual": "%1 and %2 wrote in %4", - "user-posted-in-public-room-triple": "%1, %2 and %3 wrote in %5", - "user-posted-in-public-room-multiple": "%1, %2 and %3 others wrote in %5", + "new-messages-from": "%2的%1新信息", + "new-message-in": "%1的新消息", + "new-messages-in": " %2的 %1 个新消息", + "user-posted-in-public-room": "%1 在%3发表", + "user-posted-in-public-room-dual": "%1 和 %2 在 %4发表", + "user-posted-in-public-room-triple": "%1, %2 和%3 在%5发表", + "user-posted-in-public-room-multiple": "%1, %2 和 %3 其他人在 %5发表", "upvoted-your-post-in": "%1 在 %2 点赞了您的帖子。", "upvoted-your-post-in-dual": "%1 和 %2 在 %3 赞了您的帖子。", - "upvoted-your-post-in-triple": "%1, %2 and %3 have upvoted your post in %4.", - "upvoted-your-post-in-multiple": "%1, %2 and %3 others have upvoted your post in %4.", + "upvoted-your-post-in-triple": "%1, %2 和 %3 赞同了您在 %4的帖子。", + "upvoted-your-post-in-multiple": "%1, %2和其余 %3 位 赞同了您在%4的帖子", "moved-your-post": "您的帖子已被 %1 移动到了 %2", "moved-your-topic": "%1 移动了 %2", "user-flagged-post-in": "%1 在 %2 标记了一个帖子", "user-flagged-post-in-dual": "%1 和 %2 在 %3 举报了一个帖子", - "user-flagged-post-in-triple": "%1, %2 and %3 flagged a post in %4", - "user-flagged-post-in-multiple": "%1, %2 and %3 others flagged a post in %4", + "user-flagged-post-in-triple": "%1, %2 和 %3 在%4中标记了一个帖子", + "user-flagged-post-in-multiple": "%1, %2 和其余 %3 人在 %4中标记了一个帖子", "user-flagged-user": "%1 举报了 (%2) 的用户资料", "user-flagged-user-dual": "%1 和 %2 举报了 (%3) 的用户资料", - "user-flagged-user-triple": "%1, %2 and %3 flagged a user profile (%4)", - "user-flagged-user-multiple": "%1, %2 and %3 others flagged a user profile (%4)", + "user-flagged-user-triple": "%1, %2 和 %3 标记了一个用户资料 (%4)", + "user-flagged-user-multiple": "%1, %2 和其余 %3 人 标记了一个用户资料 (%4)", "user-posted-to": "%1 回复了：%2", "user-posted-to-dual": "%1 和 %2 回复了: %3", - "user-posted-to-triple": "%1, %2 and %3 have posted replies to: %4", - "user-posted-to-multiple": "%1, %2 and %3 others have posted replies to: %4", + "user-posted-to-triple": "%1, %2 和 %3 对%4发表回复", + "user-posted-to-multiple": "%1, %2 和其余 %3 人 对%4发表回复", "user-posted-topic": "%1 发表了新主题：%2", "user-edited-post": "%1 在 %2 编辑了一个帖子", - "user-posted-topic-with-tag": "%1 has posted %2 (tagged %3)", - "user-posted-topic-with-tag-dual": "%1 has posted %2 (tagged %3 and %4)", - "user-posted-topic-with-tag-triple": "%1 has posted %2 (tagged %3, %4, and %5)", - "user-posted-topic-with-tag-multiple": "%1 has posted %2 (tagged %3)", + "user-posted-topic-with-tag": "%1发表了%2(标签 %3)", + "user-posted-topic-with-tag-dual": "%1 发表了 %2 (标签：%3 和 %4)", + "user-posted-topic-with-tag-triple": "%1 发表了 %2 (标签： %3, %4, 和 %5)", + "user-posted-topic-with-tag-multiple": "%1发表了 %2 (标签： %3)", "user-posted-topic-in-category": "%1 发表了新主题：%2", "user-started-following-you": "%1关注了您。", "user-started-following-you-dual": "%1 和 %2 关注了您。", - "user-started-following-you-triple": "%1, %2 and %3 started following you.", - "user-started-following-you-multiple": "%1, %2 and %3 others started following you.", + "user-started-following-you-triple": "%1, %2 和%3 关注了您", + "user-started-following-you-multiple": "%1, %2和其他 %3 人 关注了您", "new-register": "%1 发出了注册请求", "new-register-multiple": "有 %1 条注册申请等待批准。", "flag-assigned-to-you": "举报 %1 已经被指派给您", @@ -82,14 +82,14 @@ "notification-and-email": "同时使用 通知 和 邮件 提醒我", "notificationType-upvote": "当有人顶了我的帖子时", "notificationType-new-topic": "当您关注的人发布了主题时", - "notificationType-new-topic-with-tag": "When a topic is posted with a tag you follow", - "notificationType-new-topic-in-category": "当你关注的版块有主题发布时", + "notificationType-new-topic-with-tag": "已发布的主题中有您关注的标签", + "notificationType-new-topic-in-category": "当您关注的版块有主题发布时", "notificationType-new-reply": "当您正在查看的主题中有新回复时", "notificationType-post-edit": "当您关注的主题有帖子被编辑时", "notificationType-follow": "当有人关注您时", "notificationType-new-chat": "当您收到聊天消息时", "notificationType-new-group-chat": "当您收到群聊消息时", - "notificationType-new-public-chat": "When you receive a public group chat message", + "notificationType-new-public-chat": "当您收到公共群聊消息时", "notificationType-group-invite": "当您收到用户组邀请时", "notificationType-group-leave": "当用户离开您的用户组时", "notificationType-group-request-membership": "当有人请求加入您拥有的用户组时", @@ -97,5 +97,5 @@ "notificationType-post-queue": "当有新帖子等待审核时", "notificationType-new-post-flag": "当有新的帖子举报时", "notificationType-new-user-flag": "当有新的用户信息举报时", - "notificationType-new-reward": "当你获得新奖励时" + "notificationType-new-reward": "当您获得新奖励时" } \ No newline at end of file diff --git a/public/language/zh-CN/post-queue.json b/public/language/zh-CN/post-queue.json index 97747db6fd..a1a5d47414 100644 --- a/public/language/zh-CN/post-queue.json +++ b/public/language/zh-CN/post-queue.json @@ -3,7 +3,7 @@ "post-queue": "发布队列", "no-queued-posts": "发帖队列中没有帖子。", "no-single-post": "您正在查看的主题或帖子已经不在队列中。它可能已经被批准或删除。", - "enabling-help": "The post queue is currently disabled. To enable this feature, go to Settings → Post → Post Queue and enable Post Queue.", + "enabling-help": "发帖队列已禁用，要启用，请转到设置→帖子→发帖队列然后启用发帖队列", "back-to-list": "回到发帖队列", "public-intro": "如果你有帖子等待发布，它们会显示在这里", "public-description": "本论坛设置为新用户帖子进入发布队列，等待版主审核。
如果你有帖子等待发布，它们会显示在这里。", @@ -39,5 +39,5 @@ "remove-selected-confirm": "你想删除%1的选定帖子吗？", "bulk-accept-success": "%1个帖子已接受", "bulk-reject-success": "%1个帖子已拒绝", - "links-in-this-post": "Links in this post" + "links-in-this-post": "帖子中的链接" } \ No newline at end of file diff --git a/public/language/zh-CN/rewards.json b/public/language/zh-CN/rewards.json index dbc21866b0..af17f593fa 100644 --- a/public/language/zh-CN/rewards.json +++ b/public/language/zh-CN/rewards.json @@ -1,6 +1,6 @@ { - "awarded-x-reputation": "你已经获得%1声望", - "awarded-group-membership": "你已加入群组%1", + "awarded-x-reputation": "您已经获得%1声望", + "awarded-group-membership": "您已加入群组%1", "essentials/user.reputation-conditional-value": "（声望%1 %2）", "essentials/user.postcount-conditional-value": "（帖子数%1 %2）", From c52364a51d8220051bdb0b8e1c8aad12260c3a4c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 14 Jul 2024 13:20:19 -0400 Subject: [PATCH 20/21] fix(deps): update dependency compare-versions to v6.1.1 (#12693) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 8f3f94b7a4..674c9b9c23 100644 --- a/install/package.json +++ b/install/package.json @@ -51,7 +51,7 @@ "clipboard": "2.0.11", "colors": "1.4.0", "commander": "12.0.0", - "compare-versions": "6.1.0", + "compare-versions": "6.1.1", "compression": "1.7.4", "connect-flash": "0.1.1", "connect-mongo": "5.1.0", From cb4bf9dd531a1e0089f163aa30b0f5917918a8ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 15 Jul 2024 09:04:37 -0400 Subject: [PATCH 21/21] chore: up widgets --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 05be3af0a0..94abfdee3c 100644 --- a/install/package.json +++ b/install/package.json @@ -108,7 +108,7 @@ "nodebb-theme-lavender": "7.1.8", "nodebb-theme-peace": "2.2.6", "nodebb-theme-persona": "13.3.25", - "nodebb-widget-essentials": "7.0.16", + "nodebb-widget-essentials": "7.0.17", "nodemailer": "6.9.13", "nprogress": "0.2.0", "passport": "0.7.0",