Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from NodeBB:master #102

Open
wants to merge 3,599 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3599 commits
Select commit Hold shift + click to select a range
038fb71
refactor: post queue btn and dropdown
barisusakli Nov 8, 2024
a9fc13d
fix: block search showing old matches
barisusakli Nov 8, 2024
40758b3
refactor: add some margin bottom to bs tags
barisusakli Nov 8, 2024
3dff083
refactor: move flags into core
barisusakli Nov 8, 2024
9be5b8a
remove striped table
barisusakli Nov 8, 2024
24e9adf
chore: up themes
barisusakli Nov 9, 2024
a4d8baf
chore: up peace
barisusakli Nov 9, 2024
eb3c2cd
Latest translations and fallbacks
nodebb-misty Nov 9, 2024
c731a5e
remove p from help text
barisusakli Nov 9, 2024
ae36a72
Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop
barisusakli Nov 9, 2024
6aa8f1b
chore: up themes
barisusakli Nov 9, 2024
d63a828
chore: up themes
barisusakli Nov 9, 2024
79c93c8
chore: up persona
barisusakli Nov 10, 2024
6f89bf6
chore: up persona
barisusakli Nov 10, 2024
d349915
apply changes from harmony to core bottomsheet
barisusakli Nov 10, 2024
f13b7f8
chore: up harmony
barisusakli Nov 10, 2024
e139bd6
remove margin top from topic alerts
barisusakli Nov 10, 2024
30f914e
Latest translations and fallbacks
nodebb-misty Nov 10, 2024
6a71fd2
chore: up widgets
barisusakli Nov 10, 2024
09a9fe1
Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop
barisusakli Nov 10, 2024
953ea60
chore: up peace
barisusakli Nov 10, 2024
e8ded02
Latest translations and fallbacks
nodebb-misty Nov 11, 2024
70d9950
test: fix spec
barisusakli Nov 11, 2024
d5c9c0b
fix: spec
barisusakli Nov 11, 2024
aa57b24
fix(deps): update dependency postcss to v8.4.48 (#12907)
renovate[bot] Nov 11, 2024
87c276d
fix(deps): update dependency winston to v3.17.0 (#12906)
renovate[bot] Nov 11, 2024
4ad082b
chore: up themes
barisusakli Nov 11, 2024
5e3102b
add icons to custom profile fields
barisusakli Nov 11, 2024
b89036c
chore(i18n): fallback strings for new resources: nodebb.admin-manage-…
nodebb-misty Nov 11, 2024
524b2b7
chore: up peace
barisusakli Nov 11, 2024
b6774bb
Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop
barisusakli Nov 11, 2024
bcf8dee
chore: up peace
barisusakli Nov 11, 2024
6af5cef
refactor: no category sharing for a long time
barisusakli Nov 11, 2024
7179a28
chore: up peace
barisusakli Nov 11, 2024
acd42c2
chore: up peace
barisusakli Nov 12, 2024
1a4a9d0
chore: up persona
barisusakli Nov 12, 2024
0f12aac
Latest translations and fallbacks
nodebb-misty Nov 12, 2024
965ca63
chore: up themes
barisusakli Nov 12, 2024
deac696
Latest translations and fallbacks
nodebb-misty Nov 13, 2024
2ec3d1a
chore: up themes
barisusakli Nov 13, 2024
9e2b88a
add core skin fixes
barisusakli Nov 13, 2024
d477090
fix: don't crash if post is undefined
barisusakli Nov 13, 2024
20da714
refactor: remove unused uids
barisusakli Nov 13, 2024
28aba7b
Merge branch 'master' into develop
barisusakli Nov 13, 2024
0622608
catch errors from handleExpired
barisusakli Nov 13, 2024
db291ec
fix: filter undefined posts/topics
barisusakli Nov 13, 2024
08a87d1
Merge branch 'master' into develop
barisusakli Nov 13, 2024
2e0b8b3
Latest translations and fallbacks
nodebb-misty Nov 14, 2024
03cea23
chore: up harmony
barisusakli Nov 14, 2024
e132889
Latest translations and fallbacks
nodebb-misty Nov 15, 2024
85f5569
fix(deps): update dependency postcss to v8.4.49 (#12910)
renovate[bot] Nov 15, 2024
4279128
fix(deps): update dependency cron to v3.2.1 (#12911)
renovate[bot] Nov 15, 2024
5e9b7b4
fix: button to match category dropdown
barisusakli Nov 15, 2024
ee91e51
fix(deps): update dependency sass to v1.81.0 (#12916)
renovate[bot] Nov 15, 2024
ff25802
chore(deps): update dependency sass-embedded to v1.81.0 (#12914)
renovate[bot] Nov 15, 2024
6863763
fix(deps): update dependency ace-builds to v1.36.5 (#12913)
renovate[bot] Nov 15, 2024
0d0f914
chore(deps): update postgres docker tag to v17.1 (#12915)
renovate[bot] Nov 15, 2024
9473724
Latest translations and fallbacks
nodebb-misty Nov 16, 2024
5ff0533
Latest translations and fallbacks
nodebb-misty Nov 18, 2024
836e845
fix: dont allow core user fields to be used as custom fields
barisusakli Nov 19, 2024
b676c22
chore(i18n): fallback strings for new resources: nodebb.error
nodebb-misty Nov 19, 2024
a304247
fix(deps): update dependency @fortawesome/fontawesome-free to v6.7.0 …
renovate[bot] Nov 19, 2024
e375038
get whitelisted fields from plugins as well
barisusakli Nov 19, 2024
9cf85ce
feat: add date and multiselect custom fields
barisusakli Nov 20, 2024
174be39
chore(i18n): fallback strings for new resources: nodebb.admin-manage-…
nodebb-misty Nov 20, 2024
8f944e9
Latest translations and fallbacks
nodebb-misty Nov 21, 2024
1412585
fix: dont show chat upload btn if maxFileSize is 0, #12926
barisusakli Nov 21, 2024
2324a5b
chore: up harmony
barisusakli Nov 21, 2024
d32a7c3
silence color function deprecations on prod
barisusakli Nov 21, 2024
5b3b003
fix: #12927, give more right padding on FF
barisusakli Nov 22, 2024
57e6595
Latest translations and fallbacks
nodebb-misty Nov 22, 2024
d04a2a1
Latest translations and fallbacks
nodebb-misty Nov 23, 2024
c3b42c8
fix(deps): update dependency mongodb to v6.11.0 (#12932)
renovate[bot] Nov 23, 2024
80b4d10
fix(deps): update dependency @fortawesome/fontawesome-free to v6.7.1 …
renovate[bot] Nov 23, 2024
f9c4815
fix(deps): update dependency nodebb-plugin-2factor to v7.5.7 (#12930)
renovate[bot] Nov 23, 2024
036f456
chore(deps): update postgres docker tag to v17.2 (#12931)
renovate[bot] Nov 23, 2024
151e016
chore(deps): update commitlint monorepo to v19.6.0 (#12920)
renovate[bot] Nov 23, 2024
6f08325
Latest translations and fallbacks
nodebb-misty Nov 24, 2024
49e0e1a
feat: add pagination to groups page, api routes
barisusakli Nov 24, 2024
8605584
fix: spec, dont show registered-users, verified-users, unverified-use…
barisusakli Nov 24, 2024
61d43ee
test: fix crash due to excludeGroups
barisusakli Nov 24, 2024
2db5b81
fix(deps): update dependency sortablejs to v1.15.4 (#12934)
renovate[bot] Nov 25, 2024
388a156
chore: up themes
barisusakli Nov 25, 2024
3f14373
chore: combine admin/settings/guest.json language file into admin/set…
julianlam Nov 25, 2024
bc5b91a
fix: update acp template to use new lang keys
julianlam Nov 25, 2024
a767818
chore: migrate admin/settings/homepage.json into admin/settings/gener…
julianlam Nov 25, 2024
ab143b1
chore: migrate admin/settings/languages.json into admin/settings/gene…
julianlam Nov 25, 2024
206613d
chore: migrate admin/settings/social.json into admin/settings/general…
julianlam Nov 25, 2024
669c9c5
feat: move website/location fields into custom user fields
barisusakli Nov 25, 2024
173c604
test: fix tests
barisusakli Nov 25, 2024
e6f78d2
feat: use displayname in chat system messages, closes #12937
barisusakli Nov 26, 2024
6ebff2e
refactor: shorter check for showfullname
barisusakli Nov 26, 2024
985e5e3
chore(i18n): fallback strings for new resources: nodebb.admin-setting…
nodebb-misty Nov 26, 2024
047ae78
Update README.md
barisusakli Nov 26, 2024
7bb2ed3
Latest translations and fallbacks
nodebb-misty Nov 27, 2024
a16c0c3
Merge branch 'master' into develop
barisusakli Nov 27, 2024
f032da2
chore: incrementing version number - v3.11.0
nodebb-misty Nov 27, 2024
0333d26
chore: update changelog for v3.11.0
nodebb-misty Nov 27, 2024
77382e3
feat: add visibility option to, closes #12942
barisusakli Nov 28, 2024
1c33285
chore(i18n): fallback strings for new resources: nodebb.admin-manage-…
nodebb-misty Nov 28, 2024
a18188b
Latest translations and fallbacks
nodebb-misty Nov 29, 2024
7c9d92a
Latest translations and fallbacks
nodebb-misty Nov 30, 2024
69c460a
Latest translations and fallbacks
nodebb-misty Dec 1, 2024
8c5d7c4
deps: update connect-redis to 8
barisusakli Dec 1, 2024
4348815
Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop
barisusakli Dec 1, 2024
694827c
fix(deps): update dependency sortablejs to v1.15.6 (#12943)
renovate[bot] Dec 1, 2024
abecd61
Latest translations and fallbacks
nodebb-misty Dec 2, 2024
9a63587
feat: add "keep original image after resize" option
barisusakli Dec 2, 2024
0c66534
chore(i18n): fallback strings for new resources: nodebb.admin-setting…
nodebb-misty Dec 2, 2024
69a08c0
feat: use displayname in chat teasers/userlist, in digest email
barisusakli Dec 2, 2024
36ce3ed
Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop
barisusakli Dec 2, 2024
4db5a5b
chore: up mentions
barisusakli Dec 2, 2024
a4a752b
chore: up themes
barisusakli Dec 2, 2024
b9ed786
Latest translations and fallbacks
nodebb-misty Dec 3, 2024
309fcf4
Latest translations and fallbacks
nodebb-misty Dec 4, 2024
2e0a175
fix: users page QoL improvements
julianlam Dec 4, 2024
5b60aee
fix: issue where clicking on a topic thumb caused a page nav, fixes #…
julianlam Dec 4, 2024
18abf2c
default visiblilty to all
barisusakli Dec 5, 2024
38d904b
fix(deps): update dependency connect-redis to v8.0.1 (#12944)
renovate[bot] Dec 5, 2024
55ad7af
chore(deps): update dependency mocha to v11 (#12954)
renovate[bot] Dec 5, 2024
122d384
fix(deps): update dependency webpack to v5.97.1 (#12953)
renovate[bot] Dec 5, 2024
3bd447b
fix(deps): update dependency sass to v1.82.0 (#12952)
renovate[bot] Dec 5, 2024
6e2b33b
chore(deps): update dependency sass-embedded to v1.82.0 (#12951)
renovate[bot] Dec 5, 2024
300ca70
fix(deps): update dependency chart.js to v4.4.7 (#12950)
renovate[bot] Dec 5, 2024
59df4f3
Update docker-compose.yml (#12949)
matt4499 Dec 5, 2024
26026fb
fix: escape about me on user flags
barisusakli Dec 6, 2024
4e69bff
fix: escape about me on user flags
barisusakli Dec 6, 2024
55a07bc
fix(deps): update dependency express to v4.21.2 (#12955)
renovate[bot] Dec 6, 2024
a72c067
chore: up peace
barisusakli Dec 6, 2024
ba009ee
Merge branch 'master' into develop
barisusakli Dec 7, 2024
3a7e973
chore: up spam-be-gone
barisusakli Dec 7, 2024
e5c8deb
chore: up spam-be-gone
barisusakli Dec 7, 2024
14f698f
chore(config): migrate config renovate.json (#12960)
renovate[bot] Dec 8, 2024
c8a3866
fix: closes #12957, don't overflow thumbs modal if filename is too long
barisusakli Dec 8, 2024
e6bdbb6
feat: add some missing canonical tags, closes #12961
barisusakli Dec 9, 2024
4568ec3
fix: closes #12962, fix js error for guests on /users
barisusakli Dec 9, 2024
e532dcb
chore: up themes
barisusakli Dec 9, 2024
fe81153
refactor: remove "password" in comments
barisusakli Dec 9, 2024
c69765e
lint: long line
barisusakli Dec 9, 2024
0201bc1
chore: incrementing version number - v3.11.1
nodebb-misty Dec 9, 2024
fee5781
chore: update changelog for v3.11.1
nodebb-misty Dec 9, 2024
9d2af7e
refactor: replace math.random with crypto
barisusakli Dec 9, 2024
0495842
lint: missing semi
barisusakli Dec 9, 2024
76caa92
refactor: only send required fields in query
barisusakli Dec 9, 2024
c25fd40
fix: race condition that results in 2x localReset call the same process
barisusakli Dec 9, 2024
bb0ff6d
refactor: explicit settings/appearance routes
barisusakli Dec 10, 2024
b05dc7f
test: fix test
barisusakli Dec 10, 2024
468d930
test: remove routes that no longer exist
barisusakli Dec 10, 2024
6eb2807
test: add missing spec files
barisusakli Dec 10, 2024
2a085cd
chore: up persona
barisusakli Dec 10, 2024
521e679
Latest translations and fallbacks
nodebb-misty Dec 10, 2024
04eb9e1
fix: closes #12963, change translation to general
barisusakli Dec 10, 2024
8f465af
refactor: add csrf protection to webinstall POST route
barisusakli Dec 10, 2024
3852076
refactor: check if caches have the requested cache name
barisusakli Dec 10, 2024
3b713af
fix: make sure theme screenshot starts with themeDir
barisusakli Dec 10, 2024
e0c345b
chore: up themes
barisusakli Dec 10, 2024
607d189
chore(deps): update dependency lint-staged to v15.2.11 (#12964)
renovate[bot] Dec 10, 2024
cc6963f
chore: remove lines re: incrementing version number, in changelog
julianlam Dec 11, 2024
68198e8
feat: add support for saas_plan
barisusakli Dec 11, 2024
26a1a2f
chore(i18n): fallback strings for new resources: nodebb.admin-extend-…
nodebb-misty Dec 11, 2024
456373c
test: add missing field
barisusakli Dec 12, 2024
6b77441
fix(deps): update dependency nodebb-theme-peace to v2.2.29 (#12967)
renovate[bot] Dec 12, 2024
27867d7
refactor: move to saas plugin
barisusakli Dec 12, 2024
a23392e
Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop
barisusakli Dec 12, 2024
6b5b9a4
chore(i18n): fallback strings for new resources: nodebb.admin-extend-…
nodebb-misty Dec 12, 2024
68f87cc
test: fix spec
barisusakli Dec 12, 2024
edca4ca
Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop
barisusakli Dec 12, 2024
3d33c5c
fix(deps): update dependency mongodb to v6.12.0 (#12966)
renovate[bot] Dec 12, 2024
0913c30
fix(deps): update dependency cron to v3.3.0 (#12965)
renovate[bot] Dec 12, 2024
3a8ae12
fix(deps): update dependency jsesc to v3.1.0 (#12968)
renovate[bot] Dec 12, 2024
b8a0a50
fix(deps): update dependency cron to v3.3.1 (#12969)
renovate[bot] Dec 12, 2024
645bddb
fix(deps): update dependency nodebb-theme-peace to v2.2.30 (#12970)
renovate[bot] Dec 12, 2024
7c89767
Merge branch 'master' into develop
barisusakli Dec 12, 2024
03b9df0
chore: up harmony
barisusakli Dec 12, 2024
5045a1a
chore: up harmony
barisusakli Dec 12, 2024
8883eaf
fix: chat header line-height
barisusakli Dec 12, 2024
a79426f
chore: up themes
barisusakli Dec 13, 2024
0f5e145
chore: up peace, refactor widgets
barisusakli Dec 13, 2024
fb42c4c
Latest translations and fallbacks
nodebb-misty Dec 14, 2024
abcb200
refactor: closes #12979, show plugin id/version on semver error
barisusakli Dec 16, 2024
f0aa960
fix: closes #12980, properly reset all plugins with `./nodebb reset -a`
barisusakli Dec 16, 2024
7f02003
fix(deps): update dependency sass to v1.83.0 (#12975)
renovate[bot] Dec 17, 2024
c4399dd
chore(deps): update dependency sass-embedded to v1.83.0 (#12974)
renovate[bot] Dec 17, 2024
a054cbd
fix(deps): update dependency terser-webpack-plugin to v5.3.11 (#12973)
renovate[bot] Dec 17, 2024
a154786
Latest translations and fallbacks
nodebb-misty Dec 17, 2024
831422d
chore: up harmony
barisusakli Dec 17, 2024
a65c707
Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop
barisusakli Dec 17, 2024
69214d7
fix(deps): update dependency @fortawesome/fontawesome-free to v6.7.2 …
renovate[bot] Dec 17, 2024
f25312a
chore(deps): update dependency @commitlint/cli to v19.6.1 (#12981)
renovate[bot] Dec 17, 2024
05f08d8
Latest translations and fallbacks
nodebb-misty Dec 18, 2024
808e483
fix(deps): update dependency ace-builds to v1.37.0 (#12983)
renovate[bot] Dec 18, 2024
9d6a8ce
chore: incrementing version number - v3.12.0
nodebb-misty Dec 18, 2024
5395062
chore: update changelog for v3.12.0
nodebb-misty Dec 18, 2024
b4ec3a6
chore: up persona
barisusakli Dec 19, 2024
18904bb
chore: up harmony
barisusakli Dec 20, 2024
9bb8002
fix: check install.values, it can be undefined
barisusakli Dec 20, 2024
1bc331c
chore: incrementing version number - v3.12.1
nodebb-misty Dec 20, 2024
2260676
chore: update changelog for v3.12.1
nodebb-misty Dec 20, 2024
89b8de5
fix: make fork/move dropdowns go up
barisusakli Dec 21, 2024
a489abc
fix: #12991, switch to nodemailer address object
barisusakli Dec 22, 2024
5b2dfd7
chore: up harmony
barisusakli Dec 23, 2024
1cb7bb6
fix: don't close search if children have focus, closes #13004
barisusakli Dec 23, 2024
d40762b
fix: js error when clicking a notification
barisusakli Dec 23, 2024
e71feee
fix: closes #13002, make chats keyboard focusable
barisusakli Dec 23, 2024
c69fa81
fix: convert to str than filter
barisusakli Dec 24, 2024
a6f0eba
fix: test on redis
barisusakli Dec 24, 2024
646b9ea
refactor: remove debug
barisusakli Dec 24, 2024
7752149
fix: closes #13008, catch errors in post redirect
barisusakli Dec 24, 2024
f478ada
fix: dont stripEXIF from gifs
barisusakli Dec 24, 2024
c60cee5
fix: #13007, replace $ with \uFF04, like .
barisusakli Dec 24, 2024
2f72e32
fix: truncate popular search terms, closes #13010
barisusakli Dec 24, 2024
80ddc03
chore: up composer-default
barisusakli Dec 24, 2024
5236610
feat: use displayname for user image titles
barisusakli Dec 24, 2024
25655d5
fix: #13011, catch errors
barisusakli Dec 25, 2024
e4dd697
refactor: get rid of RegExp
barisusakli Dec 25, 2024
45c5351
feat: closes #13001, allow keyboard to change cover position
barisusakli Dec 27, 2024
a0e6681
refactor: check if useragent exists firt
barisusakli Dec 27, 2024
1b13cce
fix: overflow on dashboard/searches
barisusakli Dec 28, 2024
68f73fd
https://github.com/NodeBB/NodeBB/issues/13018
barisusakli Jan 2, 2025
48944a8
chore: up deps
barisusakli Jan 2, 2025
dcc2342
fix: closes #13019, use displayname in vote tooltip
barisusakli Jan 3, 2025
0a135d8
chore: up markdown
barisusakli Jan 3, 2025
fa24f1d
test: fix thumb test
barisusakli Jan 3, 2025
29804a1
test: fix user picture test
barisusakli Jan 3, 2025
fcf50a3
fix: closes #13022, don't do anything if notif setting isnt set to email
barisusakli Jan 4, 2025
d155da3
feat: add missing default notification settings
barisusakli Jan 5, 2025
238a3ed
fix: closes #13024, on register dont auto login with user doesn't hav…
barisusakli Jan 6, 2025
4f682a3
feat: add -y flag to upgrade, closes #13023
barisusakli Jan 6, 2025
7bfca7b
lint: index.js
barisusakli Jan 6, 2025
27e945f
lint: whitespace
barisusakli Jan 6, 2025
d75b169
refactor: silence deprecations in prod
barisusakli Jan 7, 2025
8864e65
test: add back disabled test since node 18 is minimum
barisusakli Jan 7, 2025
d5ae91a
test: debounce/throttle
barisusakli Jan 7, 2025
95b42f8
test: add helper tests
barisusakli Jan 7, 2025
407b0cc
test: subfolder in category link
barisusakli Jan 7, 2025
225c91e
test: add translateInPlace test
barisusakli Jan 7, 2025
127e0e2
test: fix relative path in tests
barisusakli Jan 7, 2025
0d3a875
test: missing translator tests
barisusakli Jan 7, 2025
b129c6c
test: fix controller tests
barisusakli Jan 7, 2025
2f5effd
chore: remove log
barisusakli Jan 7, 2025
ae2bd5a
test: custom fields tests
barisusakli Jan 7, 2025
54233dc
test: add last one
barisusakli Jan 7, 2025
e845afc
test: missing service worker test
barisusakli Jan 7, 2025
82538ca
test: editor tests
barisusakli Jan 7, 2025
d05c203
fix: closes #13036, if image isn't loaded yet width is 0
barisusakli Jan 8, 2025
25f1fa6
test: remove resizeImageWidth
barisusakli Jan 8, 2025
2329806
test: fix spec
barisusakli Jan 8, 2025
4aeafb6
chore: incrementing version number - v3.12.2
nodebb-misty Jan 8, 2025
98e5d1b
chore: update changelog for v3.12.2
nodebb-misty Jan 8, 2025
45eabbf
fix: don't confirm emails on HEAD request
barisusakli Jan 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Latest translations and fallbacks
  • Loading branch information
nodebb-misty committed Dec 4, 2024
commit 309fcf4e2b70c5cd5b823c5a10bfb54852fbdc49
4 changes: 2 additions & 2 deletions public/language/nb/admin/manage/privileges.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"view-edit-history": "Vis redigeringshistorikk",
"delete-posts": "Slett innlegg",
"view-deleted": "Vis slettede innlegg",
"upvote-posts": "Stem opp innlegg",
"downvote-posts": "Stem ned innlegg",
"upvote-posts": "Tilrå innlegg",
"downvote-posts": "Ikke tilrå innlegg",
"delete-topics": "Slett emner",
"purge": "Rensk",
"moderate": "Moderere",
Expand Down
2 changes: 1 addition & 1 deletion public/language/nb/category.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"not-watching.description": "Ikke vis emner i ulest, vis i nylig",
"ignoring.description": "Ikke vis emner i ulest & nylig",
"watching.message": "Du ser nå på oppdateringer fra denne kategorien og alle underkategorier",
"tracking.message": "Du sporer nå oppdateringer fra denne kategorien og alle underkategorier",
"tracking.message": "Du følger nå oppdateringer fra denne kategorien og alle underkategorier",
"notwatching.message": "Du ser ikke på oppdateringer fra denne kategorien og alle underkategorier",
"ignoring.message": "Du ignorerer nå oppdateringer fra denne kategorien og alle underkategorier",
"watched-categories": "Overvåkede kategorier",
Expand Down
10 changes: 5 additions & 5 deletions public/language/nb/topic.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"deleted-message": "Denne tråden har blitt slettet. Bare brukere med trådhåndterings-privilegier kan se den.",
"following-topic.message": "Du vil nå motta varsler når noen skriver i denne tråden.",
"not-following-topic.message": "Du vil se denne tråden i trådlisten, men du vil ikke motta varslinger når noen skriver i den.",
"ignoring-topic.message": "Du vil ikke lenger se denne tråden blandt de uleste trådene. Du vil få et varsel når du blir nevnt eller din tråd blir oppstemt.",
"ignoring-topic.message": "Du vil ikke lenger se denne tråden blant de uleste trådene. Du vil få et varsel når du blir nevnt eller din tråd blir tilrådd.",
"login-to-subscribe": "Vennligst registrer deg eller logg inn for å abonnere på denne tråden.",
"markAsUnreadForAll.success": "Tråd markert som ulest for alle.",
"mark-unread": "Merk som ulest",
Expand Down Expand Up @@ -159,7 +159,7 @@
"move-posts-instruction": "Klikk på innleggene du vil flytte, og skriv deretter inn en emne-ID, eller gå til målemnet",
"move-topic-instruction": "Velg målkategorien og klikk deretter flytt",
"change-owner-instruction": "Klikk på innleggene du vil tildele til en annen bruker",
"manage-editors-instruction": "Manage the users who can edit this post below.",
"manage-editors-instruction": "Administrer brukere som kan redigere dette innlegget nedenfor.",
"composer.title-placeholder": "Skriv din tråd-tittel her",
"composer.handle-placeholder": "Skriv inn navnet ditt / signatur her",
"composer.hide": "Gjem",
Expand Down Expand Up @@ -187,7 +187,7 @@
"newest-to-oldest": "Nyeste til eldste",
"recently-replied": "Seneste svar",
"recently-created": "Siste innlegg",
"most-votes": "Flest stemmer",
"most-votes": "Flest tilrådinger",
"most-posts": "Flest innlegg",
"most-views": "Flest visninger",
"stale.title": "Lag en ny tråd i stedet?",
Expand Down Expand Up @@ -215,8 +215,8 @@
"post-quick-reply": "Raskt svar",
"navigator.index": "Innlegg %1 av %2",
"navigator.unread": "%1 ulest",
"upvote-post": "Stem opp innlegg",
"downvote-post": "Stem ned innlegg",
"upvote-post": "Tilrå innlegg",
"downvote-post": "Ikke tilrå innlegg",
"post-tools": "Innleggsverktøy",
"unread-posts-link": "Lenke til uleste innlegg",
"thumb-image": "Miniatyrbilde for emne"
Expand Down
12 changes: 6 additions & 6 deletions public/language/nb/user.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"change-password": "Endre passord",
"change-password-error": "Ugyldig passord!",
"change-password-error-wrong-current": "Ditt gjeldende passord er ikke korrekt!",
"change-password-error-same-password": "Your new password matches your current password, please use a new password.",
"change-password-error-same-password": "Passordet ditt har utløpt, vennligst velg et nytt passord",
"change-password-error-match": "Passordene må samsvare!",
"change-password-error-privileges": "Du har ikke rettigheter tli å endre dette passordet.",
"change-password-success": "Passordet ditt ble oppdatert!",
Expand All @@ -97,7 +97,7 @@
"crop-picture": "Beskjær bilde",
"upload-cropped-picture": "Beskjær og last opp",
"avatar-background-colour": "Avatar bakgrunnsfarge",
"settings": "Innstillinger",
"settings": "Brukerinnstillinger",
"show-email": "Vis min e-post",
"show-fullname": "Vis mitt fulle navn",
"restrict-chats": "Bare tillat chat-meldinger fra brukere jeg følger",
Expand All @@ -111,11 +111,11 @@
"has-no-follower": "Denne brukeren har ingen følgere :(",
"follows-no-one": "Denne brukeren følger ingen :(",
"has-no-posts": "Denne brukeren har ikke skrevet noe enda.",
"has-no-best-posts": "Denne brukeren har ingen opp-stemte innlegg ennå.",
"has-no-best-posts": "Denne brukeren har ingen tilrådde innlegg ennå.",
"has-no-topics": "Denne brukeren har ikke skrevet noen tråder enda.",
"has-no-watched-topics": "Denne brukeren har ikke fulgt noen tråder enda.",
"has-no-ignored-topics": "Denne brukeren har ikke ignorert noen emner ennå",
"has-no-read-topics": "This user hasn't read any topics yet.",
"has-no-read-topics": "Denne brukeren har ikke lest noen tråder enda.",
"has-no-upvoted-posts": "Denne brukeren har ikke stemt opp noen innlegg ennå.",
"has-no-downvoted-posts": "Denne brukeren har ikke stemt ned noen innlegg ennå.",
"has-no-controversial-posts": "Denne brukeren har ikke noen nedstemte innlegg ennå.",
Expand Down Expand Up @@ -147,8 +147,8 @@
"follow-topics-you-create": "Følg tråder du vil lage",
"grouptitle": "Gruppetittel",
"group-order-help": "Velg en gruppe og bruk pilene for å gi titler",
"show-group-title": "Show group title",
"hide-group-title": "Hide group title",
"show-group-title": "Vis gruppetittel",
"hide-group-title": "Skjul gruppetittel",
"order-group-up": "Order group up",
"order-group-down": "Order group down",
"no-group-title": "Ingen gruppetittel",
Expand Down
4 changes: 2 additions & 2 deletions public/language/zh-CN/email.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"digest.title.day": "您的每日摘要",
"digest.title.week": "您的每周摘要",
"digest.title.month": "您的每月摘要",
"notif.chat.new-message-from-user": "New message from \"%1\"",
"notif.chat.new-message-from-user-in-room": "New message from %1 in room %2",
"notif.chat.new-message-from-user": "来自 \"%1\" 的新消息",
"notif.chat.new-message-from-user-in-room": "来自 %1 在房间 %2 中的新消息",
"notif.chat.cta": "点击这里继续会话",
"notif.chat.unsub.info": "根据您的订阅设置,为您发送此聊天提醒。",
"notif.post.unsub.info": "根据您的订阅设置,为您发送此回帖提醒。",
Expand Down
28 changes: 14 additions & 14 deletions public/language/zh-CN/error.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"reset-rate-limited": "太多密码重置请求(总数有限)",
"reset-same-password": "新的密码不能与当前使用的相同",
"user-banned": "用户已禁止",
"user-banned-reason": "抱歉,此帐号已经被封禁 (原因:%1)",
"user-banned-reason": "抱歉,此帐号已经被封禁原因:%1",
"user-banned-reason-until": "抱歉,此账号已被封禁,直到 %1(原因:%2)",
"user-too-new": "抱歉,您需要等待 %1 秒后,才可以发帖!",
"blacklisted-ip": "对不起,您的 IP 地址已被社区禁用。如果您认为这是一个错误,请与管理员联系。",
Expand Down Expand Up @@ -181,20 +181,20 @@
"not-enough-reputation-min-rep-signature": "您需要 %1 声望以添加签名档",
"not-enough-reputation-min-rep-profile-picture": "您需要 %1 声望以设置头像",
"not-enough-reputation-min-rep-cover-picture": "您需要 %1 声望以设置封面图片",
"not-enough-reputation-custom-field": "You need %1 reputation for %2",
"custom-user-field-value-too-long": "Custom field value too long, %1",
"custom-user-field-select-value-invalid": "Custom field selected option is invalid, %1",
"custom-user-field-invalid-text": "Custom field text is invalid, %1",
"custom-user-field-invalid-link": "Custom field link is invalid, %1",
"custom-user-field-invalid-number": "Custom field number is invalid, %1",
"custom-user-field-invalid-date": "Custom field date is invalid, %1",
"invalid-custom-user-field": "Invalid custom user field, \"%1\" is already used by NodeBB",
"not-enough-reputation-custom-field": "您需要 %1 声望才能 %2",
"custom-user-field-value-too-long": "自定义字段值过长,%1",
"custom-user-field-select-value-invalid": "选中的自定义字段选项无效,%1",
"custom-user-field-invalid-text": "无效的自定义字段文本,%1",
"custom-user-field-invalid-link": "无效的自定义字段链接,%1",
"custom-user-field-invalid-number": "无效的自定义字段数字,%1",
"custom-user-field-invalid-date": "无效的自定义字段日期,%1",
"invalid-custom-user-field": "无效的自定义用户字段,“%1”已被 NodeBB 使用。",
"post-already-flagged": "您已举报此帖",
"user-already-flagged": "您已举报此用户",
"post-flagged-too-many-times": "此贴已被其他用户举报",
"user-flagged-too-many-times": "此用户已被其他用户举报",
"too-many-post-flags-per-day": "你每日可以举报%1 个帖子",
"too-many-user-flags-per-day": "你每日可以举报 %1个用户",
"too-many-post-flags-per-day": "你每日可以举报 %1 个帖子",
"too-many-user-flags-per-day": "你每日可以举报 %1 个用户",
"cant-flag-privileged": "您不能举报特权用户(版主/全局版主/管理员)的内容或资料",
"cant-locate-flag-report": "无法确定举报报告",
"self-vote": "您不能对您自己的帖子投票",
Expand All @@ -209,8 +209,8 @@
"wrong-login-type-username": "请输入您的用户名登录",
"sso-registration-disabled": "已禁用通过 %1 账户的注册,请先使用邮箱地址注册",
"sso-multiple-association": "您无法将此服务中的多个账户关联到您的NodeBB账号。请您分离的现有账号并重试。",
"invite-maximum-met": "您的邀请人数超出了上限 (%1 超过了 %2)。",
"no-session-found": "未登录!",
"invite-maximum-met": "您的邀请人数超出了上限%1 超过了 %2。",
"no-session-found": "未登录",
"not-in-room": "用户已不在聊天室中",
"cant-kick-self": "您不能把自己踢出群组",
"no-users-selected": "尚未选择用户",
Expand Down Expand Up @@ -247,5 +247,5 @@
"api.500": "在试图为您的请求提供服务时出现了一个意外的错误。",
"api.501": "您试图调用的路由还没被实现,请明天重试",
"api.503": "您试图调用的路由因为服务器配置而目前不可用",
"api.reauth-required": "您试图访问的资源需要(重新)进行身份验证。"
"api.reauth-required": "您试图访问的资源需要(重新)进行身份验证。"
}
2 changes: 1 addition & 1 deletion public/language/zh-CN/flags.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"target-purged": "被举报的内容已经被清除,不再可用。",
"target-aboutme-empty": "这个用户没有设置 "关于我" 。",

"graph-label": "日举报",
"graph-label": "每日举报",
"quick-filters": "快速过滤器",
"filter-active": "该列中有一个或更多激活的过滤器",
"filter-reset": "删除过滤器",
Expand Down
4 changes: 2 additions & 2 deletions public/language/zh-CN/groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
"event.updated": "群组信息已更新",
"event.deleted": "群组 \"%1\" 已被删除",
"membership.accept-invitation": "接受邀请",
"membership.accept.notification-title": "你现在是 <strong>%1</strong>的成员了",
"membership.accept.notification-title": "你现在是 <strong>%1</strong> 的成员了",
"membership.invitation-pending": "邀请中",
"membership.join-group": "加入群组",
"membership.leave-group": "退出群组",
"membership.leave.notification-title": "<strong>%1</strong> 退出了群组:<strong>%2</strong>",
"membership.reject": "拒绝",
"new-group.group-name": "群组名:",
"new-group.group-name": "群组名",
"upload-group-cover": "上传群组封面",
"bulk-invite-instructions": "输入您要邀请加入此群组的用户名,多个用户以逗号分隔",
"bulk-invite": "批量邀请",
Expand Down
2 changes: 1 addition & 1 deletion public/language/zh-CN/ip-blacklist.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"validate": "验证黑名单",
"apply": "应用黑名单",
"hints": "格式建议",
"hint-1": "每行定义一个独立 IP 地址。您可以添加 IP 块,只要它们满足 CIDR 格式(e.g. <code>192.168.100.0/22</code>)。",
"hint-1": "每行定义一个独立 IP 地址。您可以添加 IP 块,只要它们满足 CIDR 格式(例如:<code>192.168.100.0/22</code>。",
"hint-2": "您可以通过以<code>#</code>标志开头的行来添加注释。",

"validate.x-valid": "<strong>%1</strong> / <strong>%2</strong>的规则有效。",
Expand Down
30 changes: 15 additions & 15 deletions public/language/zh-CN/modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"chat.chat-with-usernames-and-x-others": "与%1 & %2 和其他人聊天",
"chat.send": "发送",
"chat.no-active": "暂无聊天",
"chat.user-typing-1": "<strong>%1</strong> is typing ...",
"chat.user-typing-2": "<strong>%1</strong> and <strong>%2</strong> are typing ...",
"chat.user-typing-3": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> are typing ...",
"chat.user-typing-n": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> others are typing ...",
"chat.user-typing-1": "<strong>%1</strong> 正在输入...",
"chat.user-typing-2": "<strong>%1</strong> <strong>%2</strong> 正在输入...",
"chat.user-typing-3": "<strong>%1</strong><strong>%2</strong> <strong>%3</strong> 正在输入...",
"chat.user-typing-n": "<strong>%1</strong><strong>%2</strong> 和其余 <strong>%3</strong> 人正在输入...",
"chat.user-has-messaged-you": "%1 向您发送了消息。",
"chat.replying-to": "回复 %1",
"chat.see-all": "全部对话",
Expand All @@ -34,10 +34,10 @@
"chat.delete-message-confirm": "您确定您要删除此消息吗?",
"chat.retrieving-users": "查找用户",
"chat.view-users-list": "查看用户列表",
"chat.pinned-messages": "Pinned Messages",
"chat.no-pinned-messages": "There are no pinned messages",
"chat.pin-message": "Pin Message",
"chat.unpin-message": "Unpin Message",
"chat.pinned-messages": "已置顶消息",
"chat.no-pinned-messages": "这里没有已置顶消息",
"chat.pin-message": "置顶消息",
"chat.unpin-message": "取消置顶消息",
"chat.public-rooms": "公开房间(1%)",
"chat.private-rooms": "私有房间(1%)",
"chat.create-room": "创建聊天室",
Expand Down Expand Up @@ -88,13 +88,13 @@
"composer.uploading": "正在上传 %1",
"composer.formatting.bold": "加粗",
"composer.formatting.italic": "倾斜",
"composer.formatting.heading": "Heading",
"composer.formatting.heading1": "Heading 1",
"composer.formatting.heading2": "Heading 2",
"composer.formatting.heading3": "Heading 3",
"composer.formatting.heading4": "Heading 4",
"composer.formatting.heading5": "Heading 5",
"composer.formatting.heading6": "Heading 6",
"composer.formatting.heading": "标题",
"composer.formatting.heading1": "标题 1",
"composer.formatting.heading2": "标题 2",
"composer.formatting.heading3": "标题 3",
"composer.formatting.heading4": "标题 4",
"composer.formatting.heading5": "标题 5",
"composer.formatting.heading6": "标题 6",
"composer.formatting.list": "列表",
"composer.formatting.strikethrough": "删除线",
"composer.formatting.code": "代码",
Expand Down
8 changes: 4 additions & 4 deletions public/language/zh-CN/notifications.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"you-have-unread-notifications": "您有未读的通知。",
"all": "所有",
"topics": "主题",
"tags": "Tags",
"tags": "标签",
"categories": "版块",
"replies": "回复",
"chat": "聊天",
Expand All @@ -25,13 +25,13 @@
"my-flags": "指派举报给我",
"bans": "封禁",
"new-message-from": "来自 <strong>%1</strong> 的新消息",
"new-messages-from": "<strong>%2</strong>的%1新信息",
"new-messages-from": "来自 <strong>%2</strong> 的 %1 条新消息",
"new-message-in": "<strong>%1</strong>的新消息",
"new-messages-in": " <strong>%2</strong>的 %1 个新消息",
"new-messages-in": " <strong>%2</strong>的 %1 条新消息",
"user-posted-in-public-room": "<strong>%1</strong> 在<strong class=\"text-nowrap\"><i class=\"fa %2\"></i>%3</strong>发表",
"user-posted-in-public-room-dual": "<strong>%1</strong> 和 <strong>%2</strong> 在 <strong class=\"text-nowrap\"><i class=\"fa %3\"></i>%4</strong>发表",
"user-posted-in-public-room-triple": "<strong>%1</strong>, <strong>%2</strong> 和<strong>%3</strong> 在<strong class=\"text-nowrap\"><i class=\"fa %4\"></i>%5</strong>发表",
"user-posted-in-public-room-multiple": "<strong>%1</strong>, <strong>%2</strong> %3 其他人在 <strong class=\"text-nowrap\"><i class=\"fa %4\"></i>%5</strong>发表",
"user-posted-in-public-room-multiple": "<strong>%1</strong>, <strong>%2</strong> 和其余 %3 人在 <strong class=\"text-nowrap\"><i class=\"fa %4\"></i>%5</strong>发表",
"upvoted-your-post-in": "<strong>%1</strong> 在 <strong>%2</strong> 点赞了您的帖子。",
"upvoted-your-post-in-dual": "<strong>%1</strong> 和 <strong>%2</strong> 在 <strong>%3</strong> 赞了您的帖子。",
"upvoted-your-post-in-triple": "<strong>%1</strong>, <strong>%2</strong> 和 <strong>%3</strong> 赞同了您在 <strong>%4</strong>的帖子。",
Expand Down
2 changes: 1 addition & 1 deletion public/language/zh-CN/pages.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"account/topics": "%1 创建的主题",
"account/groups": "%1 的群组",
"account/watched-categories": "%1 关注的版块",
"account/watched-tags": "%1's 关注的标签",
"account/watched-tags": "%1 关注的标签",
"account/bookmarks": "%1 收藏的帖子",
"account/settings": "用户设置",
"account/settings-of": "改变设置的 %1",
Expand Down