diff --git a/Dictionaries/en_US_se.xml b/Dictionaries/en_US_se.xml
index 9073ee856..bf475aac2 100644
--- a/Dictionaries/en_US_se.xml
+++ b/Dictionaries/en_US_se.xml
@@ -191,6 +191,7 @@
cyanotic
darmstadtium
darndest
+ dealmaking
debride
debridement
decompensating
@@ -418,6 +419,7 @@
mycelial
nah
namaste
+ narrowminded
nasties
neighbour
neighbourhood
@@ -499,6 +501,7 @@
polenta
polonium
polysulfide
+ postsurgical
postulator
potassium
praseodymium
@@ -511,6 +514,7 @@
pseudoachondroplasia
pupillary
purée
+ pushback
radium
radon
ragdoll
@@ -576,6 +580,7 @@
slipspace
smartphone
smartphones
+ snakelet
snuck
sociopathic
sodium
@@ -603,6 +608,7 @@
stepmom
stereotactic
sternotomy
+ storyboarded
strontium
subclavian
subdural hematoma
@@ -708,6 +714,7 @@
where'd
where're
which
+ whodunit
why'd
why's
wizarding
diff --git a/Dictionaries/en_names.xml b/Dictionaries/en_names.xml
index 6d996766e..ac525f302 100644
--- a/Dictionaries/en_names.xml
+++ b/Dictionaries/en_names.xml
@@ -1437,6 +1437,7 @@
Rafferty
Raiden
Raina
+ Rajan
Ramiro
Rashad
Rayan
diff --git a/Dictionaries/names.xml b/Dictionaries/names.xml
index bb2b49d2a..bc210ff4a 100644
--- a/Dictionaries/names.xml
+++ b/Dictionaries/names.xml
@@ -11,8 +11,10 @@ This file is case sensitive.
3D
6ix9ine
7-Eleven
+ A'Dayle
A.M.
AAA
+ AFIS
Aaden
Aaliyah
Aaron
@@ -28,8 +30,8 @@ This file is case sensitive.
Abe
Abed
Abel
- Abercrombie
Abercrombie and Fitch
+ Abercrombie
Abernathy
Abiah
Abigail
@@ -54,7 +56,6 @@ This file is case sensitive.
Adamas
Adams
Adan
- A'Dayle
Addams
Adderall
Addie
@@ -84,7 +85,6 @@ This file is case sensitive.
Adwin
Aeon
Affleck
- AFIS
Agatha
Agnes
Aguilera
@@ -220,15 +220,15 @@ This file is case sensitive.
Andi
Andie
Ando
- Andorra
Andorra la Vella
+ Andorra
Andre
Andrea
Andreas
AndreasB88
Andres
- Andrew
Andrew Dice Clay
+ Andrew
Andrews
Androctonus
Android
@@ -376,39 +376,43 @@ This file is case sensitive.
Avenue
Avery
Avodart
- Axel
Axel Foley
+ Axel
Ayden
Aziz
Azkaban
Azkadellia
Azoulay
+ BBC
+ BIOS
+ BMW
+ BP
Bab Ezzouar
Babcock
Babol
Babruysk
Babtista
Babylon
- Bacău
Bacca
Bacolod
Bacoor
+ Bacău
Badajoz
Badalona
Badillo
Bafoussam
Bagdad
- Bagé
Baghdad
Bagley
Baguio
+ Bagé
Bahamas
Baharampur
Bahawalnagar
Bahawalpur
- Bahía Blanca
Bahir Dar
Bahraich
+ Bahía Blanca
Baia Mare
Baicheng
Baidoa
@@ -428,7 +432,6 @@ This file is case sensitive.
Baleshwar
Balfus
Bali
- Balıkesir
Balikpapan
Balkan
Balkans
@@ -436,9 +439,9 @@ This file is case sensitive.
Ballarat
Ballard
Baltar
- Bălți
Baltimore
Balurghat
+ Balıkesir
Bamako
Bambi
Bamenda
@@ -446,8 +449,8 @@ This file is case sensitive.
Banda Aceh
Bandar Abbas
Bandar Seri Begawan
- Bandırma
Bandung
+ Bandırma
Bangalore
Bangkok
Bangladesh
@@ -547,7 +550,6 @@ This file is case sensitive.
Baze
Bazhou City
Bazile
- BBC
Beals
Beastie Boys
Beatles
@@ -559,7 +561,6 @@ This file is case sensitive.
Beawar
Becca
Beccas
- Béchar
Bechmann
Beck
Becker
@@ -578,11 +579,9 @@ This file is case sensitive.
Beijing
Beipiao
Beirut
- Béjaïa
Bekasi
Belafonte
Belarus
- Belém
Belenko
Belfast
Belford Roxo
@@ -599,6 +598,7 @@ This file is case sensitive.
Belov
Beltzer
Belvedere
+ Belém
Ben
Benadryl
Bendel
@@ -669,8 +669,8 @@ This file is case sensitive.
Bettiah
Betty
Bettys
- Beverly
Beverly Hills
+ Beverly
Beverlys
Bevilacqua
Beyoncé
@@ -693,9 +693,9 @@ This file is case sensitive.
Bhuj
Bhusawal
Bhutan
- Białystok
Bianca
Bianchi
+ Białystok
Bib Fortuna
Bible
Bickerson
@@ -711,19 +711,17 @@ This file is case sensitive.
Bila Tserkva
Bilal
Bilbao
- Bill
Bill Clinton
Bill Gates
- Billie
+ Bill
Billie Holiday
- Billy
+ Billie
Billy Ray Cyrus
+ Billy
Billys
Bilskrot
- Biñan
Bingley
Binzhou
- BIOS
Biratnagar
Birchwood
Birjand
@@ -736,6 +734,7 @@ This file is case sensitive.
Bixby
Biysk
Bizerte
+ Biñan
Black Eyed Peas
BlackBerry
Blackburn
@@ -759,7 +758,6 @@ This file is case sensitive.
Bluetooth
Blumenau
Blyth
- BMW
Bnei Brak
Bo
Bob
@@ -810,9 +808,9 @@ This file is case sensitive.
Bostons
Botan
Botanica
- Botoșani
Botou
Botox
+ Botoșani
Botshabelo
Bottrop
Botucatu
@@ -829,9 +827,8 @@ This file is case sensitive.
Boyko
Bozeman
Bozhou
- BP
- Brad
Brad Pitt
+ Brad
Braden
Bradford
Bradley
@@ -843,7 +840,6 @@ This file is case sensitive.
Braga
Bragança Paulista
Braiden
- Brăila
Brampton
Branagh
Branda
@@ -859,7 +855,6 @@ This file is case sensitive.
Brantford
Brasilia
Brasília
- Brașov
Bratcher
Bratislava
Bratsk
@@ -872,6 +867,7 @@ This file is case sensitive.
Braydon
Braze
Brazzaville
+ Brașov
Breck
Breda
Bree
@@ -885,6 +881,7 @@ This file is case sensitive.
Brennen
Brent
Brenton
+ Brentwood
Brescia
Bret
Brett
@@ -930,8 +927,8 @@ This file is case sensitive.
Bruce
Bruces
Bruges
- Brunei
Brunei Darussalam
+ Brunei
Brunella
Bruni
Bruno
@@ -942,13 +939,14 @@ This file is case sensitive.
Bryce
Brycen
Bryson
+ Brăila
Bucaramanga
Buchanan
Buchanans
Bucharest
Bucheon
- Buckingham
Buckingham Palace
+ Buckingham
Buckley
Buckner
Budapest
@@ -972,7 +970,6 @@ This file is case sensitive.
Bumblebee
Bundchen
Bundy
- Buôn Ma Thuột
Burao
Burbank
Burewala
@@ -982,15 +979,14 @@ This file is case sensitive.
Burke
Burkhardt
Burkhoff
- Burkina
Burkina Faso
+ Burkina
Burkinabé
Burkitt
Burkowski
Burnaby
Burnett
Burnetts
- burrito
Burrows
Bursa
Burt
@@ -1006,8 +1002,9 @@ This file is case sensitive.
Buttersfield
Butuan
Butwal
- Buzău
Buzzini
+ Buzău
+ Buôn Ma Thuột
Byakko
Byam
Bydgoszcz
@@ -1015,9 +1012,24 @@ This file is case sensitive.
Byron
Bytom
Byzantium
+ Béchar
+ Béjaïa
+ Bălți
+ C-3PO
C.O.
C.T.
- C-3PO
+ CBI
+ CBS
+ CDC
+ CEOs
+ CIA
+ CIAs
+ CNN
+ COD
+ COVID-19
+ CSI
+ CTO
+ CTU
Caballero
Caden
Cadillac
@@ -1106,8 +1118,8 @@ This file is case sensitive.
Carnahan
Carol
Carole
- Carolina
Carolina Panthers
+ Carolina
Caroline
Carolines
Carols
@@ -1145,9 +1157,6 @@ This file is case sensitive.
Cavenaugh
Cavennaugh
Cayden
- CBI
- CBS
- CDC
Cece
Ceci
Cecil
@@ -1163,12 +1172,10 @@ This file is case sensitive.
Celtic
Centerville
Centipedophile
- CEOs
Cerberus
Cerilla
Cersei
Cesar
- Cézanne
Chad
Chadwick
Chaffee
@@ -1190,7 +1197,6 @@ This file is case sensitive.
Charmaine
Chatsworth
Chavez
- Chávez
Chaz
Che Guevara
Chehalis
@@ -1220,8 +1226,8 @@ This file is case sensitive.
Chewbacca
Chewie
Cheyenne
- Chicago
Chicago Bulls
+ Chicago
Chicagos
Childs
Chile
@@ -1249,16 +1255,15 @@ This file is case sensitive.
Christophers
Christy
Chrysler
- Chuck
Chuck E. Cheese
+ Chuck
Chucks
- Chucky
Chucky Cheese
+ Chucky
Chun-Li
Churchill
- CIA
+ Chávez
Cialis
- CIAs
Cicero
Cincinnati
Cindy
@@ -1286,7 +1291,6 @@ This file is case sensitive.
Clayton
Claytons
Clementine
- Clémentine
Cleo
Cleopatra
Cleveland
@@ -1299,14 +1303,13 @@ This file is case sensitive.
Clintons
Clomid
Clyde
- CNN
+ Clémentine
Cobb
Coby
- Coca
Coca-Cola
+ Coca
Cochran
Cochrane
- COD
Cody
Codys
Cohen
@@ -1315,8 +1318,8 @@ This file is case sensitive.
Cole
Coleman
Colette
- Colin
Colin Firth
+ Colin
Colleen
Collier
Colliers
@@ -1374,13 +1377,11 @@ This file is case sensitive.
Cosmopolitan
Costa Rica
Costanza
- Côte d'Ivoire
Cottle
Coulson
Coumadin
Couric
Courtney
- COVID-19
Covina
Covington
Cox
@@ -1407,9 +1408,6 @@ This file is case sensitive.
Cruella
Cruithne
Cruz
- CSI
- CTO
- CTU
Cuba
Cullen
Cullough
@@ -1424,11 +1422,26 @@ This file is case sensitive.
Cyprus
Cyrus
Cystectomy
+ Cézanne
+ Côte d'Ivoire
+ D'Alessandro
+ D'Anthony
+ D'Artagnan
+ D'Haran
+ D'Harans
D.C.
D.O.A.
- D’Haran
- D’Harans
+ DARPA
+ DC
+ DEA
+ DJs
+ DNA
+ DNB
+ DOJ
+ DVD
+ DVDs
Da Vinci
+ DaVinci
Dabneys
Daenerys
Daisy
@@ -1437,7 +1450,6 @@ This file is case sensitive.
Dakota
Dalai Lama
Dale
- D'Alessandro
Dalgaard
Dallas
Dallin
@@ -1467,7 +1479,6 @@ This file is case sensitive.
Danson
Dante
Dantes
- D'Anthony
Danvers
Daphne
Daquiri
@@ -1484,7 +1495,6 @@ This file is case sensitive.
Darlene
Darnell
Darnells
- DARPA
Darrak
Darrell
Darren
@@ -1492,8 +1502,6 @@ This file is case sensitive.
Darrion
Darrius
Darryl
- d'Artagnan
- D'Artagnan
Darth Vader
Darwin
Darwins
@@ -1503,8 +1511,8 @@ This file is case sensitive.
Daughtry
Dauphine
Dautry
- Dave
Dave Matthews Band
+ Dave
Davenport
Davey
Davian
@@ -1513,7 +1521,6 @@ This file is case sensitive.
Davidson
Davies
Davin
- DaVinci
Davion
Davis
Davy
@@ -1523,8 +1530,11 @@ This file is case sensitive.
Daxton
Dayton
Daytona
- DC
- DEA
+ DeBeers
+ DeLillo
+ DeLuca
+ DeMarco
+ DeWitt
Deacon
Dean
Deandra
@@ -1533,7 +1543,6 @@ This file is case sensitive.
Deb
Debbie
Debbies
- DeBeers
Debnam-Carey
Deborah
Debra
@@ -1557,16 +1566,13 @@ This file is case sensitive.
Delgatto
Delhi
Delia
- DeLillo
Dell
Dellon
- DeLuca
- DeMarco
Demetri
Demetrius
Demitrius
- Democratic
Democratic Republic of the Congo
+ Democratic
Deneuve
Denise
Denmark
@@ -1602,23 +1608,23 @@ This file is case sensitive.
Devyn
Dewar
Dewey
- DeWitt
Dex
Dexter
Dexters
Dhaka
Dhara
- D'Haran
- D'Harans
Dharavi
Dharma
+ DiCaprio
+ DiLeo
+ DiMaggio
+ DiNozzo
Diakos
Diana
Dianas
Diane
Diaz
Diazepam
- DiCaprio
Dickie
Dickies
Dickinson
@@ -1629,33 +1635,26 @@ This file is case sensitive.
Dilantin
Dilaurentise
Dilaurentises
- DiLeo
Dili
Dillan
Dillinger
Dillon
- DiMaggio
Dimitri
Dimitris
Dina
Dingwall
- DiNozzo
Dion
Diovan
Disney
Disneyland
- divxsweden
Dixie
Dixon
Dixons
Dj Khaled
Djibouti
Djingis
- DJs
Dmitri
Dmitrij
- DNA
- DNB
Dobby
Doctore
Dodgers
@@ -1665,11 +1664,10 @@ This file is case sensitive.
Doha
Doheny
Doherty
- DOJ
Dolce & Gabbana
Dollhouse
- Dolly
Dolly Parton
+ Dolly
Dolores
Dom Pérignon
Domenic
@@ -1678,11 +1676,11 @@ This file is case sensitive.
Dominick
Dominique
Dominus
- Don
Don King
+ Don
Donaghy
- Donald
Donald Trump
+ Donald
Donavan
Dongalor
Donley
@@ -1713,12 +1711,12 @@ This file is case sensitive.
Dov
Dover
Doyle
- Dr.
Dr. Blaize
Dr. Glassman
Dr. Hunt
Dr. Lim
Dr. Singer
+ Dr.
Draco
Dracula
Draculas
@@ -1758,27 +1756,30 @@ This file is case sensitive.
Duris
Durmstrang
Dushanbe
- Düsseldorf
Dustin
Duxbury
- DVD
- DVDs
Dwayne
Dwight
Dylan
Dylans
Dylon
Dyson
+ Düsseldorf
+ D’Haran
+ D’Harans
E.R.
E.R.P.
+ EKG
+ EMT
+ ESPN
Earl
EastEnders
Eastwood
- eBay
Echelon
Echolls
Eckhart
Ed Sheeran
+ Ed's
Eddard
Eddie
Eddies
@@ -1789,11 +1790,10 @@ This file is case sensitive.
Edison
Edisons
Edith
- Edmond
Edmond Dantès
+ Edmond
Edmonton
Edmund
- Ed's
Eduardo
Edward
Edwards
@@ -1804,11 +1804,10 @@ This file is case sensitive.
Eileen
Einstein
Ekberg
- EKG
- El
El Niño
El Salvador
El Segundo
+ El
Elaine
Elana
Eleanor
@@ -1836,8 +1835,8 @@ This file is case sensitive.
Ellis
Ellison
Elly
- Elmer
Elmer Fudd
+ Elmer
Eloise
Elon Musk
Elsa
@@ -1845,13 +1844,12 @@ This file is case sensitive.
Elton
Elvis
Elvyra
- Élysée
Emanuel
Emely
Emend
Emil
- Emile
Emile Zatopek
+ Emile
Emilia
Emilie
Emilio
@@ -1862,7 +1860,6 @@ This file is case sensitive.
Emmet
Emmett
Emory
- EMT
Enbrel
Enceladus
Enfield
@@ -1900,14 +1897,13 @@ This file is case sensitive.
Escuinapa
Esperanza
Espinosa
- ESPN
Espresso
Esteban
Estebans
Estevezs
- Estévezs
Esther
Estonia
+ Estévezs
Ethan
Ethans
Ethel
@@ -1931,6 +1927,8 @@ This file is case sensitive.
Excalibur
Ezekiel
F.I.T.
+ FBI
+ FIFA
Faber
Facebook
Fairbanks
@@ -1959,7 +1957,6 @@ This file is case sensitive.
Fawkes
Fawn
Fayed
- FBI
Felicia
Felicity
Felipe
@@ -1979,7 +1976,6 @@ This file is case sensitive.
Fiddler
Fiedler
Fieldings
- FIFA
Fifi
Figg
Filch
@@ -2050,7 +2046,6 @@ This file is case sensitive.
Francisco
Franciscos
Franco
- François
Francophile
Frangelico
Frankenstein
@@ -2062,6 +2057,7 @@ This file is case sensitive.
Fransisco
Fransiscos
Franz
+ François
Fraser
Fratellis
Frawley
@@ -2103,6 +2099,9 @@ This file is case sensitive.
Furneaux
Fuschida
Futuna
+ GPS
+ GSW
+ GTA
Gabbi
Gabby
Gabe
@@ -2157,19 +2156,19 @@ This file is case sensitive.
Gemenon
Gemma
Geneva
- Genevé
- Genève
Geneviere
Genevieve
Genevive
+ Genevé
Genkai
Gentse Feesten
+ Genève
Geodon
Geoff
Geoffrey
Georg
- George
George Bush
+ George
Georgetown
Georgia
Georgianna
@@ -2207,9 +2206,9 @@ This file is case sensitive.
Gina
Ginny
Ginsberg
- Giorgio
Giorgio A. Tsoukalos
Giorgio de Chirico
+ Giorgio
Giovanni
Gisborne
Gisele
@@ -2250,7 +2249,6 @@ This file is case sensitive.
Gordons
Gore
Gotham
- GPS
Graceland
Gracie
Graham
@@ -2287,23 +2285,21 @@ This file is case sensitive.
Griselda
Grisham
Grissom
- Grønland
Grossman
Groucho
Grumpzilla
Gryff
Gryffindor
Gryffindors
- GSW
- GTA
+ Grønland
Guadalajara
Guadeloupe
Guam
Guantanamo
Guantánamo
Guarp
- Guatemala
Guatemala City
+ Guatemala
Guaymas
Gucci
Guernsey
@@ -2318,7 +2314,6 @@ This file is case sensitive.
Gunnars
Gunneson
Gunther
- Günther
Gurdeep
Gurkha
Gurkhas
@@ -2344,7 +2339,10 @@ This file is case sensitive.
Gwyneth
Gwynn
Gyllenhaal
+ Günther
H.R.
+ HIV
+ HP
Hadas
Hades
Hadley
@@ -2519,7 +2517,6 @@ This file is case sensitive.
Hitchcock
Hitler
Hitlers
- HIV
Hjalte
Hobart
Hobbes
@@ -2533,13 +2530,13 @@ This file is case sensitive.
Hollis
Hollister
Hollys
- Hollywood
Hollywood Hills
+ Hollywood
Hollywoods
Holmes
Honda
- Hong
Hong Kong
+ Hong
Honiara
Honolulu
Hoodia
@@ -2556,7 +2553,6 @@ This file is case sensitive.
Howard
Howards
Howie
- HP
Hubbard
Huben
Huber
@@ -2580,26 +2576,28 @@ This file is case sensitive.
Hutchins
Hyatt
Hyde
+ I'll
+ I've
+ IBM
+ ID
+ III
+ IQ
+ IRS
Ian
Iannone
Ians
Ibiza
- IBM
Ibrahim
- ID
Idaho
- Idris
Idris Elba
+ Idris
Igor
- III
Ikaris
Ikea
Ilana
Ilithyia
- I'll
Illinois
Ilsa
- iMac
Impreza
Incubator
India
@@ -2613,21 +2611,12 @@ This file is case sensitive.
Insulin
Internet
Interpol
- iOS
Iowa
- iPad
- iPads
- iPhone
- iPhones
- iPod
- iPods
Ipswich
- IQ
Irene
Iridessa
Irina
Irma
- IRS
Irv
Irving
Irvings
@@ -2658,8 +2647,6 @@ This file is case sensitive.
Istanbull
Italian
Italy
- iTouch
- iTunes
Itzel
Itzhak
Ivan
@@ -2668,12 +2655,10 @@ This file is case sensitive.
Ivanov
Ivanova
Ivanovich
- I've
Ivy
Iwamoto
Izabella
Izabelle
- iZombie
Izzie
Izzy
J.K. Rowling
@@ -2695,7 +2680,6 @@ This file is case sensitive.
Jad
Jaden
Jagermeister
- Jägermeister
Jagger
Jaggy
Jaguar
@@ -2707,8 +2691,8 @@ This file is case sensitive.
Jakobs
Jamaica
Jamal
- James
James Bond
+ James
Jameson
Jamie
Jamies
@@ -2744,19 +2728,19 @@ This file is case sensitive.
Jasper
Jaspers
Jaxson
+ Jay-Z
Jay
Jayden
- Jay-Z
- Jean
Jean-Baptiste
- Jeanette
Jean-Jacques
Jean-Luc
- Jeanne
+ Jean-Pierre
+ Jean
+ Jeanette
Jeanne d'Arc
+ Jeanne
Jeannette
Jeannie
- Jean-Pierre
Jebadiah
Jedediah
Jedediahs
@@ -2811,9 +2795,9 @@ This file is case sensitive.
Jim
Jimi Hendrix
Jiminy
- Jimmy
Jimmy Fallon
Jimmy Wales
+ Jimmy
Jimmys
Jims
Jin
@@ -2825,8 +2809,8 @@ This file is case sensitive.
Jodi
Jodie
Jody
- Joe
Joe Biden
+ Joe
Joel
Joes
Joey
@@ -2840,14 +2824,14 @@ This file is case sensitive.
Johansen
Johansens
Johansson
- John
John F. Kennedy
John Major
+ John
Johner
Johnnie
- Johnny
Johnny Depp
Johnny-Adam
+ Johnny
Johnnys
Johns
Johnse
@@ -2860,13 +2844,12 @@ This file is case sensitive.
Jonathan
Jones
Jonestown
- Jordan
- Jordans
Jor-El
Jor-Els
+ Jordan
+ Jordans
Jorge
Jose
- José
Josef
Josefina
Josefine
@@ -2880,13 +2863,13 @@ This file is case sensitive.
Joshua
Joshuas
Josie
+ José
Jotunheim
Joyce
- Jr
Jr.
+ Jr
Juan
Juanito
- Juárez
Juba
Judah
Judas
@@ -2895,8 +2878,8 @@ This file is case sensitive.
Juilliard
Jules
Julia
- Julian
Julian Assange
+ Julian
Julie
Julies
Juliet
@@ -2914,6 +2897,9 @@ This file is case sensitive.
Justin
Justins
Juvederm
+ Juárez
+ Jägermeister
+ K-Mart
Kaden
Kahlan
Kahlua
@@ -2935,8 +2921,8 @@ This file is case sensitive.
Kandorian
Kandorians
Kane
- Kansas
Kansas City
+ Kansas
Kara
Karakasidis
Karakof
@@ -2990,8 +2976,8 @@ This file is case sensitive.
Keegan
Keeler
Keifer
- Keiko
Keiko-chan
+ Keiko
Keith
Keller
Kellerman
@@ -3064,14 +3050,13 @@ This file is case sensitive.
Kiyoshi
Klaus
Klum
- K-Mart
Kmetko
Knicks
Knowles
Knoxville
Kodak
- Koenma
Koenma-sama
+ Koenma
Koffman
Kojak
Kolchak
@@ -3097,9 +3082,9 @@ This file is case sensitive.
Krypton
Kryptonian
Kryptonians
+ Ku-Klux-Klan
Kuala Lumpur
Kuchinashi
- Ku-Klux-Klan
Kumar
Kumbaya
Kunoichi
@@ -3108,10 +3093,10 @@ This file is case sensitive.
Kurt
Kurtz
Kurtzberg
- Kuwabara
+ Kuwa-chan
Kuwabara-kun
Kuwabara-san
- Kuwa-chan
+ Kuwabara
Kuwait City
Kwon
Kyiv
@@ -3120,26 +3105,27 @@ This file is case sensitive.
Kylie
Kylo Ren
L.A.
+ LAN
+ LAPD
+ LSD
La Paz
LaBelle
+ LaClaire
+ LaFleur
Lacerta
Lacey
Lachlan
- LaClaire
Lacombe
Lacroix
Lacy
LadiesMan217
Laelia
- Lærke
Lafayette
Lafferty
- LaFleur
Lagos
Lake Shore
Lakers
Lamictal
- LAN
Lana
Lanarca
Lancaster
@@ -3160,10 +3146,9 @@ This file is case sensitive.
Lanny
Lansing
Laos
- LAPD
Laquisha
- Lara
Lara-El
+ Lara
Larissa
Larkin
Larkins
@@ -3193,9 +3178,9 @@ This file is case sensitive.
Layla
Lazar
Lazarus
+ LeBron
Learjet
Learjets
- LeBron
Lecter
Lee
Leeds
@@ -3217,14 +3202,13 @@ This file is case sensitive.
Lennon
Lennox
Lenny
- lenovo
Lentulus
Leo
Leon
- Leonard
Leonard Nimoy
- Leonardo
+ Leonard
Leonardo da Vinci
+ Leonardo
Leone
Leoni
Leopold
@@ -3321,7 +3305,6 @@ This file is case sensitive.
Longbottom
Lonnie
Lopez
- López
Lord Milori
Lorena
Lorens
@@ -3346,7 +3329,6 @@ This file is case sensitive.
Lowrey
Loxley
Loxleys
- LSD
Luanda
Lubov
Luc
@@ -3373,8 +3355,8 @@ This file is case sensitive.
Luis
Luka
Lukas
- Luke
Luke Cage
+ Luke
Lulu
Lundy
Lunesta
@@ -3401,27 +3383,33 @@ This file is case sensitive.
Lynns
Lyon
Lyrica
+ Lærke
+ López
M.I.A
- Mac
+ MI6
+ MLB
+ MMA
+ MTAC
Mac OS
- Macarena
+ Mac
MacArthur
MacArthurs
- Macau
- Macbeth
MacDonald
MacDowell
- Macedonia
MacGregors
MacGyver
- Macha
- Machas
MacKenzie
- Mackinaws
MacLaine
MacMillan
MacMurray
MacPherson
+ Macarena
+ Macau
+ Macbeth
+ Macedonia
+ Macha
+ Machas
+ Mackinaws
Macy
Madacorp
Madacorps
@@ -3461,11 +3449,10 @@ This file is case sensitive.
Malala Yousafzai
Malawi
Malaysia
- Malcolm
Malcolm X
+ Malcolm
Malcom
Malden
- Malé
Malekai
Malfoy
Mali
@@ -3481,6 +3468,7 @@ This file is case sensitive.
Maloy
Malta
Malthe
+ Malé
Managua
Manahattan
Manama
@@ -3528,8 +3516,8 @@ This file is case sensitive.
Marguerita
Margueritas
Marguerite
- Maria
Maria-Antonias
+ Maria
Mariah
Marian
Marica
@@ -3571,8 +3559,8 @@ This file is case sensitive.
Marshall
Martha
Marthas
- Martin
Martin Luther King
+ Martin
Martinelli
Martinez
Martini
@@ -3585,9 +3573,9 @@ This file is case sensitive.
Marv
Marvin
Marx
+ Mary-Anne
Mary
Maryann
- Mary-Anne
Maryland
Marys
Masahashi
@@ -3611,9 +3599,9 @@ This file is case sensitive.
Matt
Mattei
Matteo
- Matthew
Matthew Temple
Matthew Wood
+ Matthew
Matthews
Matthias
Matts
@@ -3693,8 +3681,8 @@ This file is case sensitive.
McGinley's
McGinn
McGonagall
- McGraw
McGraw-Hills
+ McGraw
McGregor
McGuinness
McGurn
@@ -3713,7 +3701,6 @@ This file is case sensitive.
McKittrick
McLaggen
McLaughlin
- Mclntyre
McLovin
McLuhan
McMahon
@@ -3732,8 +3719,9 @@ This file is case sensitive.
McStarley
McTeag
McTorrent
- Mcullough
McVeigh
+ Mclntyre
+ Mcullough
Meade
Medellín
Medicus
@@ -3743,14 +3731,13 @@ This file is case sensitive.
Megan
Megatron
Megatrons
- Meghan
Meghan Markle
+ Meghan
Megson
Mei
Mel
Melania
Melanie
- Mélanie
Melatonin
Melbourne
Melinda
@@ -3766,12 +3753,12 @@ This file is case sensitive.
Mendez
Mengele
Merantau
- Mercedes
Mercedes-Benz
+ Mercedes
Mercer
Mercury
- Meredith
Meredith Grey
+ Meredith
Merediths
Merida
Meridius
@@ -3785,15 +3772,14 @@ This file is case sensitive.
Metropolis
Metz
Mexican
- Mexico
Mexico City
- MI6
+ Mexico
Mia
Miami
Mias
Micah
- Michael
Michael Caine
+ Michael
Michaela
Michaels
Michas
@@ -3835,6 +3821,7 @@ This file is case sensitive.
Miltons
Milwaukee
Mimi
+ Min-Young
Minada
Minamino
Minerva
@@ -3844,6 +3831,7 @@ This file is case sensitive.
Minnick
Minogue
Minsk
+ Minyoung
Miquelon
Mirabelle
Miranda
@@ -3861,8 +3849,6 @@ This file is case sensitive.
Mithraic
Mizrahi
Mjolnir
- MLB
- MMA
Moby
Modigliani
Moesha
@@ -3876,11 +3862,11 @@ This file is case sensitive.
Molinez
Molly
Mollys
+ Mon-El
Mona
Monaco
Monday
Monegasque
- Mon-El
Moneypenny
Monica
Monicas
@@ -3932,33 +3918,29 @@ This file is case sensitive.
Mousson
Mozambique
Mozart
- Mr.
Mr. Black
Mr. Blue
Mr. Green
Mr. White
- Mrs.
+ Mr.
Mrs. Orange
Mrs. Pink
Mrs. White
- Ms.
+ Mrs.
Ms. Orange
Ms. Pink
Ms. White
- MTAC
+ Ms.
Mueller
Muggles
- Muhammad
Muhammad Ali
+ Muhammad
Muhammed
Muhammeds
Mulholland
Mullholand
Mumbai
Munchausen
- München
- Münchhausen
- Münchhausens
Mundy
Munich
Muray
@@ -3975,14 +3957,31 @@ This file is case sensitive.
Muslim
Mussolini
Mustafa
+ MySpace
Mycophenolate
Myers
Myka
Mykas
- MySpace
Mystic Falls
+ Mélanie
+ München
+ Münchhausen
+ Münchhausens
+ N'Djamena
N.P.H.
N.Y.
+ NASA
+ NATO
+ NBA
+ NBT
+ NCIS
+ NFL
+ NHL
+ NORAD
+ NSA
+ NY
+ NYC
+ NYPD
Naboo
Nadeshiko
Nadia
@@ -4005,11 +4004,10 @@ This file is case sensitive.
Naomi
Napoleon
Narcissa
- NASA
Nascar
Nash
- Nashville
Nashville-Davidson
+ Nashville
Nasir
Nasonex
Nassau
@@ -4020,7 +4018,6 @@ This file is case sensitive.
Nathaniel
Nathans
Nathanson
- NATO
Natolly
Natollys
Nauru
@@ -4028,10 +4025,6 @@ This file is case sensitive.
Navy
Naylin
Naypyidaw
- NBA
- NBT
- NCIS
- N'Djamena
Ndugu
Neal
Nebraska
@@ -4042,8 +4035,8 @@ This file is case sensitive.
Nell
Nellie
Nelly
- Nelson
Nelson Mandela
+ Nelson
Nelsson
Nemesis
Nemo
@@ -4067,8 +4060,8 @@ This file is case sensitive.
New Hampshire
New Jersey
New Orleans
- New York
New York City
+ New York
New Zealand
New Zealander
Newark
@@ -4078,21 +4071,19 @@ This file is case sensitive.
Newtons
Nexium
Nez
- NFL
Ngerulmud
Nguyen
- NHL
Niagara Falls
Niamey
Nicaragua
- Nicholas
Nicholas King
+ Nicholas
Nichols
Nicholson
Nick
Nickelson
- Nicki
Nicki Minaj
+ Nicki
Nicklas
Nicky
Nico
@@ -4138,11 +4129,10 @@ This file is case sensitive.
Nogales
Noh
Nokia
- NORAD
Noras
Noreen
- Norfolk
Norfolk Island
+ Norfolk
Norma
Norman
Norris
@@ -4159,41 +4149,46 @@ This file is case sensitive.
Nottinghams
Nouakchott
November
- NSA
Nukuʻalofa
Nunez
Nussbaum
- NY
- NYC
Nymphadora
- NYPD
+ O'Banion
+ O'Barry
+ O'Boyle
+ O'Brian
+ O'Connell
+ O'Conner
+ O'Conners
+ O'Donnell
+ O'Hara
+ O'Hare
+ O'Leary
+ O'Malley
+ O'Malleys
+ O'Mally
+ O'Neal
+ O'Neill
+ O'Reilly
+ O'Sullivan
+ O'Toole
+ O'neal
O.R.
O2
Oakenshield
Oakland
Obama
- O'Banion
- O'Barry
Obi-Wan
- O'Boyle
- O'Brian
OckeJ
- O'Connell
- O'Conner
- O'Conners
October
Odessa
Odin
- O'Donnell
- O'Hara
- O'Hare
Ohio
Ojai
Okla
Oklahoma
Okubo
Old Navy
- O'Leary
Oleg
Olek
Olga
@@ -4214,24 +4209,17 @@ This file is case sensitive.
Olympics
Olympus
Omaha
- O'Malley
- O'Malleys
- O'Mally
Oman
Omar
Omni
- O'neal
- O'Neal
- O'Neill
Ontario
Onya
Ophelia
Oppenheimer
Oppenheimers
- Oprah
Oprah Winfrey
+ Oprah
Oregon
- O'Reilly
Orfeus
Orin
Orlando
@@ -4248,13 +4236,10 @@ This file is case sensitive.
Oscar
Oskar
Oslo
- Østrig
- O'Sullivan
Otis
- O'Toole
Ottawa
- Otto
Otto von Bismarck
+ Otto
Ouagadougou
Ovidius
Owen
@@ -4262,9 +4247,15 @@ This file is case sensitive.
Oxford
Oxfords
P.M.
+ PC
+ PDA
+ PLO
+ PR
+ PSP
+ PTSD
Pablo
- Pacino
PacMan
+ Pacino
Paddington
Padmé
Paige
@@ -4330,13 +4321,11 @@ This file is case sensitive.
Paxil
Paxton
Paxtons
+ PayPal
Payne
Paypal
- PayPal
Payson
Payton
- PC
- PDA
Pearlman
Pearson
Pedersen
@@ -4369,8 +4358,8 @@ This file is case sensitive.
Peruvian
Pesto
Pete
- Peter
Peter Pan
+ Peter
Peters
Petersburg
Peterson
@@ -4426,7 +4415,6 @@ This file is case sensitive.
Plavix
PlayStation
Plaza
- PLO
Plymouth
Podgorica
Polidori
@@ -4462,7 +4450,6 @@ This file is case sensitive.
Poul
Powell
Pozarsky
- PR
Prada
Prag
Pragin
@@ -4495,8 +4482,6 @@ This file is case sensitive.
Provigil
Prozac
Prue
- PSP
- PTSD
Puckett
Puente Antiguo
Puerta
@@ -4513,9 +4498,9 @@ This file is case sensitive.
Quatar
Queen-Ingela
Quentin
- Quidditch
- Qui-Gon
Qui-Gon Jinn
+ Qui-Gon
+ Quidditch
Quincy
Quinn
Quinones
@@ -4524,8 +4509,8 @@ This file is case sensitive.
R&B
R&D
Rabat
- Rachel
Rachel Grey
+ Rachel
Rachelle
Rachels
Raczynski
@@ -4549,10 +4534,10 @@ This file is case sensitive.
Ramigani
Ramirez
Ramon
- Ramón
Ramona
Ramsey
Ramzi
+ Ramón
Randall
Randolph
Randy
@@ -4567,13 +4552,13 @@ This file is case sensitive.
Rasputin
Rasta Monsta
Raul
- Raúl
Ravi
+ Ray's
Raylan
Raylene
Raymond
Rayna
- Ray's
+ Raúl
Reagan
Reaney
Rebecca
@@ -4592,8 +4577,8 @@ This file is case sensitive.
Rehoboam
Rei-gun
Reihado
- Reikai
Reikai-ju
+ Reikai
Reilly
Reiser
Rembrandt
@@ -4603,11 +4588,11 @@ This file is case sensitive.
Renata
Renault
Renee
- Renée
Renforth
Renfro
Reno
Renshaw
+ Renée
Reston
Restylane
Reuben
@@ -4620,8 +4605,8 @@ This file is case sensitive.
Reznick
Rhizoc
Rhizoctonia
- Rhode
Rhode Island
+ Rhode
Rhodey
Rhonda
Rhumor
@@ -4629,8 +4614,8 @@ This file is case sensitive.
Ric
Ricardo
Ricardus
- Richard
Richard Gere
+ Richard
Richards
Richardson
Richie
@@ -4663,8 +4648,8 @@ This file is case sensitive.
Rizzo
Robbie
Robbins
- Robert
Robert Mugabe
+ Robert
Roberta
Roberto
Roberts
@@ -4690,8 +4675,8 @@ This file is case sensitive.
Rolf
Rollerblade
Rolls-Royce
- Roman
Roman Abramovich
+ Roman
Romania
Romano
Romanoff
@@ -4764,6 +4749,12 @@ This file is case sensitive.
Ryans
Rydell
S.H.I.E.L.D.
+ SARS
+ SETI
+ SSG-SweSUB
+ SSG
+ SUV
+ SWAT
Sabina
Sabrina
Sacha Baron Cohen
@@ -4777,18 +4768,18 @@ This file is case sensitive.
Sahara
Saigon
Sainsburys
- Saint
Saint George's
Saint Helena
Saint John's
Saint Kitts and Nevis
Saint Lucia
- Saint Vincent
Saint Vincent and the Grenadines
+ Saint Vincent
+ Saint
Saiyd
Sakashita
- Sakyo
Sakyo-san
+ Sakyo
Salazar
Salem
Salim
@@ -4820,7 +4811,6 @@ This file is case sensitive.
San
Sana'a
Sanchez
- Sánchez
Sancho
Sanders
Sanderson
@@ -4833,8 +4823,8 @@ This file is case sensitive.
Santo Domingo
Santomauro
Santos
- Sao
Sao Tome
+ Sao
Sara
Sarah
Sarahs
@@ -4842,7 +4832,6 @@ This file is case sensitive.
Saras
Sarayashiki
Sarno
- SARS
Sasha
Sashas
Satan
@@ -4875,8 +4864,8 @@ This file is case sensitive.
Schwartz
Schwarzenegger
Schweitz
- Scibelli
Sci-Fi
+ Scibelli
Sciuto
Scofield
Scofields
@@ -4921,7 +4910,6 @@ This file is case sensitive.
Servillia
Seth
Seths
- SETI
Setsuna
Seuss
Severus
@@ -4989,8 +4977,8 @@ This file is case sensitive.
Sidney
Siegel
Siemens
- Sierra
Sierra Leone
+ Sierra
SiggeMcKvack
Sigmund
Signe
@@ -5036,9 +5024,9 @@ This file is case sensitive.
Sloans
Slytherin
Smallville
+ Smith-Kingsley
Smith
Smithfield
- Smith-Kingsley
Smithson
Smithsonian
Smoller
@@ -5050,8 +5038,8 @@ This file is case sensitive.
Sofia
Sofie
Sokrates
- Solomon
Solomon Islands
+ Solomon
Solonius
Somali
Somalia
@@ -5088,14 +5076,12 @@ This file is case sensitive.
Springs
Springsteen
Springwood
- Sri
Sri Jayawardenepura Kotte
Sri Lanka
+ Sri
Sriracha
- SSG
- SSG-SweSUB
- St.
St. Pierre
+ St.
Stacey
Stackhouse
Stacy
@@ -5144,16 +5130,16 @@ This file is case sensitive.
Stephanie
Stephano
Stephans
- Stephen
Stephen King
+ Stephen
Stephenie
Stephens
- Steve
Steve Jobs
+ Steve-O
+ Steve
Steven
Stevens
Stevenson
- Steve-O
Stevie
Stevies
Stevo
@@ -5198,7 +5184,6 @@ This file is case sensitive.
Sussex
Sutton
Suttons
- SUV
Suva
Suvari
Suzaku
@@ -5213,14 +5198,13 @@ This file is case sensitive.
Swanson
Swansons
Swarek
- SWAT
Swayze
Swaziland
+ SweSUB
+ SweSub
Sweetwater
Swender
Swensen
- SweSub
- SweSUB
Sybil
Sybils
Syd
@@ -5237,6 +5221,9 @@ This file is case sensitive.
Symondses
Synvisc
Syracuse
+ Sánchez
+ TV
+ TaZty
Tabitha
Tabula Rasa
Tacoma
@@ -5291,7 +5278,6 @@ This file is case sensitive.
Tayla
Taylor
Taylors
- TaZty
Tbilisi
Teagues
Teal'c
@@ -5357,6 +5343,7 @@ This file is case sensitive.
Thracian
Thraex
Thuringer
+ TiVo
Tibet
Tic Tac
Tierney
@@ -5366,8 +5353,8 @@ This file is case sensitive.
Tijuana
Tilson
Tilsons
- Tim
Tim Berners Lee
+ Tim
Timberlake
Times Square
Timex
@@ -5377,14 +5364,13 @@ This file is case sensitive.
Timor
Timothy
Timur
- Tina
Tina Turner
+ Tina
Tirana
Tiria
Tisch
Titanic
Titus
- TiVo
Tjernobyl
Tobago
Tobbs
@@ -5410,8 +5396,8 @@ This file is case sensitive.
Toni
Tonks
Tonto
- Tony
Tony Blair
+ Tony
Tonya
Tonys
Topamax
@@ -5478,7 +5464,6 @@ This file is case sensitive.
Turner
Tuscany
Tuvalu
- TV
Twitter
Ty
Tylenol
@@ -5491,6 +5476,9 @@ This file is case sensitive.
U.S.
U.V.
U2
+ USB
+ USGA
+ USS
Udaipur
Uganda
Ugolino
@@ -5503,20 +5491,20 @@ This file is case sensitive.
University of Oxford
Univille
Upper East Side
- Urameshi
Urameshi-kun
Urameshi-san
+ Urameshi
Ursula
Uruguay
Usain Bolt
- USB
- USGA
Usher
- USS
Utah
Uzbekistan
Uzis
V2
+ VCR
+ VD
+ VFX
Vaduz
Valarius
Valda
@@ -5546,8 +5534,6 @@ This file is case sensitive.
Vaughan
Vaughans
Vaughn
- VCR
- VD
Vegas
Velazquez
Venezuela
@@ -5561,16 +5547,14 @@ This file is case sensitive.
Veronica
Veronicas
Veronika
- Véronique
Vespa
- VFX
Viagra
Vic
Vicki
Vicky
Vicodin
- Victor
Victor Von Doom
+ Victor
Victoria
Victorias
Victors
@@ -5585,11 +5569,10 @@ This file is case sensitive.
Villanueva
Vilnius
Vince
- Vincent
Vincent van Gogh
+ Vincent
Vincents
Vincenzi
- vindaloo
Vindobona
Vinnie
Vinspresso
@@ -5619,10 +5602,16 @@ This file is case sensitive.
Vriess
Vuitton
Vytorin
+ Véronique
+ WITSEC
+ WLAN
+ WLVU
+ WPK
Wagner
Wainwright
Wakefield
Wakefields
+ Wal-Mart
Waldo
Waldorf
Waldorfs
@@ -5633,7 +5622,6 @@ This file is case sensitive.
Wallowski
Wally
Walmart
- Wal-Mart
Walsh
Walt
Walter
@@ -5642,10 +5630,10 @@ This file is case sensitive.
Walzer
Wanda
Wardel
- Warner
Warner Bros
- Warren
+ Warner
Warren Beatty
+ Warren
Warsaw
Warwick
Washington
@@ -5704,14 +5692,14 @@ This file is case sensitive.
Whitmore
Whitney
Whitridge
+ Wi-Fi
+ WiFi
Wichita
Wickerman
Widmore
Widmores
Wienerschnitzel
Wiesbaden
- WiFi
- Wi-Fi
Wii
Wikipedia
Wild Bill Hickok
@@ -5724,8 +5712,8 @@ This file is case sensitive.
Wilkins
Willa
Willard
- William
William Shatner
+ William
Williams
Williamson
Willie
@@ -5748,12 +5736,9 @@ This file is case sensitive.
Wiskott-Aldrich
Wisteria
Witherspoon
- WITSEC
Witwicky
- WLAN
- WLVU
- Wolfgang
Wolfgang Amadeus Mozart
+ Wolfgang
Wolfie
Wolowitz
Wolverine
@@ -5768,30 +5753,27 @@ This file is case sensitive.
Worthington
Worthwood
Worton
- WPK
Wright
Wulfric
Wuornos
Wurtzel
- www.divxsweden.se
- www.filmfix.se
Wyatt
Wyland
Wyman
Wymans
Wyoming
+ X-Men
+ X-ray
+ XJoelX
+ XY
Xanax
Xander
Xavier
Xaviers
- Xbox
Xbox One
+ Xbox
Xenical
Xerox66
- XJoelX
- X-Men
- X-ray
- XY
Y.M.C.A.
Yaeko
Yaekos
@@ -5820,9 +5802,9 @@ This file is case sensitive.
Yorks
Yorkshire
Yosef
+ YouTube
Yousef
Yousouf
- YouTube
Ystad
Yucatan
Yugoslav
@@ -5844,7 +5826,6 @@ This file is case sensitive.
Zack
Zagreb
Zaire
- Zaïre
Zalewski
Zambarloukos
Zambia
@@ -5852,6 +5833,7 @@ This file is case sensitive.
Zanus
Zanzibar
Zavala
+ Zaïre
Zealand
Zedd
Zeddicus
@@ -5877,7 +5859,6 @@ This file is case sensitive.
Zocor
Zod
Zoe
- Zoë
Zoey
Zoloft
Zor-El
@@ -5887,13 +5868,35 @@ This file is case sensitive.
Zorro
Zory
Zoysia
+ Zoë
Zuazo
Zuckerberg
Zuma
Zurich
- Zürich
Zurnigher
Zyprexa
Zyrtec
Zzyzx
+ Zürich
+ burrito
+ d'Artagnan
+ divxsweden
+ eBay
+ iMac
+ iOS
+ iPad
+ iPads
+ iPhone
+ iPhones
+ iPod
+ iPods
+ iTouch
+ iTunes
+ iZombie
+ lenovo
+ vindaloo
+ www.divxsweden.se
+ www.filmfix.se
+ Élysée
+ Østrig
\ No newline at end of file
diff --git a/src/libse/Dictionaries/StringWithoutSpaceSplitToWords.cs b/src/libse/Dictionaries/StringWithoutSpaceSplitToWords.cs
index 38707fc91..1c6c970d7 100644
--- a/src/libse/Dictionaries/StringWithoutSpaceSplitToWords.cs
+++ b/src/libse/Dictionaries/StringWithoutSpaceSplitToWords.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
using Nikse.SubtitleEdit.Core.Common;
@@ -38,7 +39,13 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
var s = input;
var check = s;
var spaces = new List();
- for (int i = 0; i < words.Length; i++)
+
+ if (words.Contains(input))
+ {
+ return input;
+ }
+
+ for (var i = 0; i < words.Length; i++)
{
var w = words[i];
if (w.Length >= input.Length)
@@ -77,5 +84,32 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
return s.Trim();
}
+
+ public static string[] LoadWordSplitList(string threeLetterIsoLanguageName, NameList nameList)
+ {
+ var fileName = $"{Configuration.DictionariesDirectory}{threeLetterIsoLanguageName}_WordSplitList.txt";
+ if (!File.Exists(fileName))
+ {
+ return Array.Empty();
+ }
+
+ var wordList = File.ReadAllText(fileName).SplitToLines().Where(p => p.Trim().Length > 0).ToList();
+
+ if (threeLetterIsoLanguageName == "eng")
+ {
+ wordList.AddRange(new List
+ {
+ // Ignore list
+ "Andor", "honour", "putain", "whoah", "eastside", "Starpath", "comlink"
+ });
+ }
+
+ if (nameList != null)
+ {
+ wordList.AddRange(nameList.GetNames().Where(p => p.Length > 4));
+ }
+
+ return wordList.OrderByDescending(p => p.Length).ToArray();
+ }
}
}
diff --git a/src/ui/Forms/SpellCheck.cs b/src/ui/Forms/SpellCheck.cs
index 0bd1abcf3..443469716 100644
--- a/src/ui/Forms/SpellCheck.cs
+++ b/src/ui/Forms/SpellCheck.cs
@@ -340,14 +340,7 @@ namespace Nikse.SubtitleEdit.Forms
_wordSplitListLanguage = languageName;
var threeLetterIsoLanguageName = Iso639Dash2LanguageCode.GetThreeLetterCodeFromTwoLetterCode(twoLetterLanguageName);
- var fileName = $"{Configuration.DictionariesDirectory}{threeLetterIsoLanguageName}_WordSplitList.txt";
- if (!File.Exists(fileName))
- {
- return Array.Empty();
- }
-
- var wordList = File.ReadAllText(fileName).SplitToLines().Where(p => p.Trim().Length > 0).ToList();
- return wordList.ToArray();
+ return StringWithoutSpaceSplitToWords.LoadWordSplitList(threeLetterIsoLanguageName, null);
}
private void FillSpellCheckDictionaries(string languageName)
diff --git a/src/ui/Logic/Ocr/OcrFixEngine.cs b/src/ui/Logic/Ocr/OcrFixEngine.cs
index 897d782a4..2310d2724 100644
--- a/src/ui/Logic/Ocr/OcrFixEngine.cs
+++ b/src/ui/Logic/Ocr/OcrFixEngine.cs
@@ -313,7 +313,7 @@ namespace Nikse.SubtitleEdit.Logic.Ocr
_nameListWithApostrophe = new HashSet();
var nameListWithPeriods = new List();
_abbreviationList = new HashSet();
- _wordSplitList = LoadWordSplitList(threeLetterIsoLanguageName, _nameListObj);
+ _wordSplitList = StringWithoutSpaceSplitToWords.LoadWordSplitList(threeLetterIsoLanguageName, _nameListObj);
var isEnglish = threeLetterIsoLanguageName.Equals("eng", StringComparison.OrdinalIgnoreCase);
foreach (var name in _nameList)
@@ -415,19 +415,6 @@ namespace Nikse.SubtitleEdit.Logic.Ocr
}
}
- private static string[] LoadWordSplitList(string threeLetterIsoLanguageName, NameList nameList)
- {
- var fileName = $"{Configuration.DictionariesDirectory}{threeLetterIsoLanguageName}_WordSplitList.txt";
- if (!File.Exists(fileName))
- {
- return Array.Empty();
- }
-
- var wordList = File.ReadAllText(fileName).SplitToLines().Where(p => p.Trim().Length > 0).ToList();
- wordList.AddRange(nameList.GetNames().Where(p => p.Length > 4));
- return wordList.OrderByDescending(p => p.Length).ToArray();
- }
-
public string SpellCheckDictionaryName
{
get