Update eff_large.wordlist

[J-J-Chiarella]

1. Replaces words removed by pull 6914 https://github.com/keepassxreboot/keepassxc/pull/6914/files/23b9e35de9a605bd9f6c6ea90e39a3ef9a55761f for possible offense. This restores the total word count.

Add replacement: grope -> . . . -> grouch

Change: hardcopy -> hardcopy -> hardback

Replace: hardcore -> . . . -> hardball

(I couldn't see "hardcopy" as a single word in American dictionaries from the turn of the century. It's too much of a neologism [and if we can't have "hardcore," then there's nothing else I can fit in that gap]. I had to remove another word to allow the addition of two new words here to preserve ordering. It's also an improvement because "hardcopy" is not a single word in dictionaries older than a decade or so.)

Add replacement: swinger -> . . . -> swindle

2. Yo-yo and yoyo are two spelling of the same exact word, and the latter spelling is "non-standard."

Keeping: yo-yo (t-shirt is the another hyphenated word and I can't find a suitable candidate for either without creating several conflicts on the long wordlist. Felt-tip stays as well.)

Change: yoyo -> young

3. Word repetition: two spellings of same word hankie.

Keeping: hankie (as the "correct" spelling because "hanky" is more common in "hanky-panky").

Change: hanky -> hanoi

(The other option was to insert "hansom" between "hanky" and "haphazard," but "handsome" is a homophone because the "d" became silent many years ago.)

4. Changed brand names to regular nouns:

dropbox -> dropforge

ebay -> eaves

google -> goosey as in "loosey-goosey" (the real word is "googol," anyhow)

This necessitated changing goon -> gooseneck

ipad -> iota

iphone -> ire

ipod -> iridium

This necessitated irate -> iris

kleenex -> knack (the word "tissue" exists)

lego -> legitimate

xbox -> xenon (which sounds like x box or x-box, too)

Keeping: xerox (now genericized like aspirin and describes a specific process)

5. Replaced non-standard words around "drop" and the brand name in there

drop-down -> drop-in

ebook -> (genericized like "email")

ecard -> echelon

This necessitated eccentric -> echidna

harddisk -> hardedge (Hardedge is an art style. Hard disk is always two words or else is abbreviated as HDD for hard disk drive)

6. Replaced flirtatious activity

footsie -> footstool

Which necessitated making footsore -> footway

7. Potentially sensitive anatomy

gonad -> golly

siamese -> siam (Siamese = Thai, but "twins" is also on the list and "Siamese" could precede "twins," which is slur for conjoined twins. Siam = Thailand)

8. Politically sensitive

islamist -> island (An Islamist is someone who wants to enforce political Islam on all with a literal and conservative interpretation of the Qu'ran. It does not mean Muslim.)

marxism -> marzipan (I'm a big old lefty, myself, but I need to be consistent)

---

These necessitated a couple changes to nearby words where a drop-in replacement word did not exist, which required shifting neighboring words slightly.

Alphabetical order preserved and total word count should match EFF's modified and the original Diceware list. No breaking changes.

Note

Condenses multiple pull requests

Type of change

• ✅ Bug fix (non-breaking change that fixes an issue)

[droidmonkey]

nice replacements, should backport these improvements over to EFF.

[codecov-commenter]

Codecov Report

Merging #7968 (e3e9a44) into develop (f15ee90) will decrease coverage by 0.00%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop    #7968      +/-   ##
===========================================
- Coverage    64.29%   64.29%   -0.00%     
===========================================
  Files          339      339              
  Lines        43430    43430              
===========================================
- Hits         27921    27920       -1     
- Misses       15509    15510       +1     

Impacted Files	Coverage Δ
src/core/Entry.cpp	82.65% <0.00%> (-0.20%)	⬇️
src/core/FileWatcher.cpp	86.75% <0.00%> (+1.20%)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f15ee90...e3e9a44. Read the comment docs.

[michaelk83]

To update the PR, after you make the changes on the same branch as before, run git commit then git push (you might need to do git push -f, not sure). Don't create a new branch.

[J-J-Chiarella]

Should there be any dashes in the wordlist? I checked the file, there are only a few occurrences, so maybe worth replacing them?

I wanted to purge the hyphens, but the sorting put the hyphen before any other letter, which made redoing "t-shirt" too much work. Nothing else is there. One would have to redo the next six or so words . There's no net gain. I put in "drop-in" because that is an accepted word, whereas "drop-down" is only computer jargon as a modifier (a drop-down menu).

Also, how is the dash ordered relative to other characters? Here you have f -> - -> k, which is rather arbitrary.

Whoops. The system sorts hyphens before all other letters. Dictionaries usually do not. I mixed them up when typing. Should be "drop-in" and then "dropforge."

michaelk83 2 hours ago

Out of order: y -> n.

Yep, whoops on that one, too. Just need to swap them in order.

To update the PR, after you make the changes on the same branch as before, run git commit then git push (you might need to do git push -f, not sure). Don't create a new branch.

This may as well be Greek to me as the expression goes. I just made these changes manually on the web browser. I didn't run anything.

Can someone with more knowledge do the edits? I have no idea where to start. Why is it so easy to do an edit and make that a pull request but editing the suggested edit is some arcane magic? Or am I missing something? I didn't "run" anything. I just clicked around in my browser.

[droidmonkey]

Made fixes, ready for merge after CI completes