badwords: catch and fix more variants of NN-bit

Closes #20304

.github/scripts/badwords.txt

@@ -78,12 +78,9 @@ file names\b:filenames
 \buser names\b:usernames
 \bpass phrase:passphrase
 \bwill\b:rewrite to present tense
-\b32bit:32-bit
-\b64bit:64-bit
-32 bit\b:32-bit
-64 bit\b:64-bit
-64-bits:64 bits or 64-bit
-32-bits:32 bits or 32-bit
+\b[0-9]+bit[^*"'%,]: NN-bit
+\b([02-9]|[1-9][0-9]+) bit\b: NN-bit
+[0-9]+-bits:NN bits or NN-bit
 \bvery\b:rephrase using an alternative word
 \bCurl\b=curl
 \bcURL\b=curl