Merge branch 'master' into pt/multitoken

# Conflicts: # languagetool-core/src/main/resources/org/languagetool/resource/spelling_global.txt
languagetool-org · Dec 22, 2023 · b297c8a · b297c8a
2 parents 8b298ab + 78a1bfc
commit b297c8a
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 272 deletions.
diff --git a/languagetool-core/src/main/resources/org/languagetool/resource/spelling_global.txt b/languagetool-core/src/main/resources/org/languagetool/resource/spelling_global.txt
@@ -5182,8 +5182,8 @@ Itamar Franco
 Marcelo Freixo
 Ciro Gomes
 Joao Goulart
-Ulysses Guimarães
-Waldir Maranhão
+Ulysses Guimaraes
+Waldir Maranhao
 Aécio Neves
 Tancredo Neves
 Antonio Palocci
@@ -14389,7 +14389,7 @@ Clara Nunes
 Carlos Lyra
 Negra Li
 Aline Barros
-Jorge Vercillo
+Jorge Vercilo
 Maysa Matarazzo
 Paulinho Moska
 Rodrigo Amarante
@@ -19842,268 +19842,11 @@ Rose Byrne
 Kullback-Leibler
 Kullback–Leibler
 Scott Alexander
-Alta Mogiana
-Anna Márton
-Carol Levy
-Elizabeth Hussey
-Jane Grey
-Jane Leeves
-Jane Moraes
-Joan Gregson
-Joan Marsh
-Joan Martí i Alanis
-Joan Riviere
-Julia Görges
-Maria Koller
-Maria Melita
-Paula Grace
-Paula Borges
-Rose Parish
-Beni Johnson
-Jennifer Walton
-Marguerite Durand
-María Moliner
-Renee Walker
-Alexis Rose
-Josie Maran
-Leonora Fani
-Marnie Simpson
-María Gabriela
-Adrian Fernández
-Alberto Setta
-Alberto Youssef
-Alessandro Safina
-Alfredo Capelli
-Amos Tucker
-Andrew Jacobson
-Andrew Marton
-André Masséna
-Anthony Martial
-Antoine Fabre d'Olivet
-Antonio Cesaro
-Antonio Maisto
-Arthur Harper
-Ben Cardin
-Ben Johnson
-Bill Hayden
-Bob Doyle
-Brian Branston
-Brian Wilcox
-Carlo Briani
-Carlos Fairbanks
-Carlos García
-Carlos Mardel
-Carlos María de Castro
-Carlos Mayolo
-Central Perk
-Charles Barlet
-Charles Gardner
-Charles Marker
-Charles Moulton
-Charles Napier
-Charles Packer
-Chris Colfer
-Chris Connelly
-Chris Conner
-David Harvey
-David Willis
-Eduardo Martini
-Edward Earl
-Edward Pescott
-Elliot Carver
-Francesco Cavallini
-Francisco Galdós
-Franz Hössler
-François Sagat
-Frédéric Sauser
-Gary Goldman
-George Busk
-George Harris
-George Saunders
-George Sisler
-Giovanni della Robbia
-Jack Kirby
-Jaime Murray
-James Bagwell
-James Boyd
-James Maslow
-Jan Schäfer
-Jean Boivin
-Jean Charcot
-Jean Martinon
-Jim Calder
-Jim Farber
-John Ball
-John Barlow
-John Berry
-John Brahm
-John Browning
-John Burton
-John Cochrane
-John Decker
-John Dee
-John Dodson
-John Dutton
-John Fassel
-John Graham
-John Hart
-John Kao
-John Kerr
-John Landon
-John Leckie
-John Leland
-John Mallas
-John Marston
-John Martyn
-John Michaels
-John Mitchell
-John Molson
-John Nicks
-John Payne
-John Pilger
-John Price
-John Sloman
-John Teller
-John Thurber
-John Walton
-John Wisker
-Jonas Falk
-José Marzán
-Joseph Bové
-Joseph Cilona
-Josué Montello
-José Blanc de Portugal
-José Mouzinho d'Albuquerque
-José Mouzinho de Albuquerque
-Juan Lavalle
-Juan Martín del Potro
-Julián Marías
-Júnior Díaz
-Kevin Johnson
-Leo Ferris
-Lucas Fernández
-Luís Thomar
-Lê Duẩn
-Manuel Murguía
-Marcel Dussault
-Marcelo Esberard
-Marcus Harvey
-Mario Zanini
-Mark Heller
-Mark Millar
-Mark Robson
-Mark Spitzer
-Mark Waid
-Martin Sostre
-Max Müller
-Michael Barber
-Michael Bolotin
-Michael Carlin
-Michael Harner
-Michael Morton
-Michael Norman
-Michael Steger
-Michael Tejera
-Michael Warner
-Miguel Burnier
-Mike Penner
-Mikhail Yuryevich
-Mario Ferraro
-Mário Gruber
-Nicholas Rombes
-Oscar Martín
-Paul Bremer
-Pablo Hernández
-Pablo Irrazábal
-Paul Bearer
-Paul Hellyer
-Paul Moller
-Paul Norman
-Paul Richter
-Paul Schmitt
-Paul Stoller
-Paul Washer
-Paul Wesley
-Paulo Casé
-Paulo Moraes
-Pedro Morales
-Pedro Solberg
-Peter MacKay
-Peter Marren
-Peter Sauber
-Peter Webber
-Phil Collen
-Rafael Carrera
-Rafael Cortez
-Ricardo Arona
-Ricardo Ferraço
-Richard Cox
-Richard Harrison
-Richard Reid
-Robert Abele
-Robert Burås
-Robert Dougall
-Robert Hunter
-Roberto Camelier
-Roberto Landell de Moura
-Roberto Martha
-Roberto Moreton
-Robin Givens
-Samuel Moises
-Thomas Anderson
-Thomas Crown
-Thomas Morell
-Thomas Muster
-Thomas Tuschl
-Tim Daly
-Tim Huddleston
-Tom Starke
-Vicente Hernández
-Victor Franke
-Walter Schnee
-William Barker
-William Caxton
-William Morrow
-Alan Wilder
-Alfred Wegener
-Andrei Babkin
-Bret Hart
-Dee Jay
-Dimitris Christoulas
-Georges Danton
-Giorgio Semeria
-Hank Zipzer
-Honoré Daumet
-Ignazio Marini
-Johnny Roberts
-Josep Reynés
-Josh Carera
-Juho Sunila
-Kenneth Ham
-Martín Casillas
-Masaki Okada
-Maurice Cuvalier
-Petr Pravec
-Ranulph Fiennes
-Ricky Morton
-Rudolf Schulten
-Rudy Vallée
-Warner Koiter
-Bent Hansen
-Bené Guedes
-Big Boi
-Billy Joe
-Eric Granado
-Eric Martin
-Hans Jonas
-Johnny Nash
-Johnny Wright
-Larry Fine
-Lui Farias
-Maicol Ferreira
-Makoto Tanaka
-Mariel Marra
-Philip Klein
-Porter Jackson
-Tyrion Lannister
-Volkswagen Gol
+Australian Maritime Safety Authority
+Jan Palach
+Apache Flink
+Harbour Energy
+Rebel Moon
+Claudine Gay
+scikit-learn
+Open Telekom Cloud
diff --git a/...agetool-language-modules/de/src/main/resources/org/languagetool/resource/de/compounds.txt b/...agetool-language-modules/de/src/main/resources/org/languagetool/resource/de/compounds.txt
@@ -11399,4 +11399,8 @@ A-cappella-Werkes*
 A-cappella-Werke*
 A-cappella-Werken*
 Apollonia-Hirscher-Preis*
-Apollonia-Hirscher-Preises*
+Apollonia-Hirscher-Preises*
+Jan-Palach-Platz*
+Jan-Palach-Platzes*
+Yucca-Palme*
+Yucca-Palmen*
diff --git a/...language-modules/de/src/main/resources/org/languagetool/resource/de/hunspell/spelling.txt b/...language-modules/de/src/main/resources/org/languagetool/resource/de/hunspell/spelling.txt
@@ -63087,3 +63087,10 @@ Inszeniertheit
 Inszeniertheiten
 Mineralfreibad
 Mineralfreibäder
+fantasieanregend/A
+Jan-Palach-Platz
+Jan-Palach-Platzes
+Jan Palach/S #name
+orkanartig/A
+Yucca-Palme/N
+Renationalisierung
diff --git a/languagetool-language-modules/de/src/main/resources/org/languagetool/rules/de/grammar.xml b/languagetool-language-modules/de/src/main/resources/org/languagetool/rules/de/grammar.xml
@@ -31278,6 +31278,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
     <!-- Groß- und Kleinschreibung -->
     <!-- ====================================================================== -->
     <category id="CASING" name="Groß-/Kleinschreibung">
+        <rule id="DAS_WUENSCHE_ICH" name="das Wünsche (wünsche) ich dir auch">
+            <!-- Provides a better suggestion than DE_AGREEMENT for "das Wünsche ich" -->
+            <pattern>
+                <token>das</token>
+                <marker>
+                    <token case_sensitive="yes" regexp="yes">Wünsche?</token>
+                </marker>
+                <token>ich</token>
+            </pattern>
+            <message>Das Verb <suggestion><match no="2" case_conversion="alllower" /></suggestion> sollte hier klein geschrieben werden.</message>
+            <example correction="wünsche">Das <marker>Wünsche</marker> ich dir auch!</example>
+        </rule>
         <rule id="STD_GROSS" name="10 std. (Std.)">
             <pattern>
                 <token regexp="yes">\d+|einer?|zwei|drei|vier|fünf|sechs|sieben|acht|neun|zehn|elf|zwölf|hundert(en)?|tausend(en)?</token>

diff --git a/...nguage-modules/en/src/main/java/org/languagetool/rules/en/AbstractEnglishSpellerRule.java b/...nguage-modules/en/src/main/java/org/languagetool/rules/en/AbstractEnglishSpellerRule.java
@@ -165,6 +165,7 @@ public abstract class AbstractEnglishSpellerRule extends MorfologikSpellerRule {
   private static final Pattern JIST = compile("[Jj]ist");
   private static final Pattern ADHOC = compile("[Ad]hoc");
   private static final Pattern DEACTIVE = compile("[De]eactive");
+  private static final Pattern HONGKONG = compile("Hong Kong");
   private static final Pattern HUBSPOT = compile("[Hh]ubspot");
   private static final Pattern URL = compile("[Uu]rl");
   private static final Pattern TV = compile("tv");
@@ -1122,7 +1123,6 @@ protected static Map<String, List<String>> getTopSuggestions() {
     s.put("grandmom", Arrays.asList("grandma", "grandmother"));
     s.put("Grandmum", Arrays.asList("Grandma", "Grandmother"));
     s.put("Grandmom", Arrays.asList("Grandma", "Grandmother"));
-    s.put("Hongkong", Arrays.asList("Hong Kong"));
     s.put("enlighting", Arrays.asList("enlightening"));
     s.put("Enlighting", Arrays.asList("Enlightening"));
     // For non-US English
@@ -1474,6 +1474,7 @@ protected List<SuggestedReplacement> getOnlySuggestions(String word) {
     if (HTTP.matcher(word).matches()) return topMatch("HTTP");
     if (HTTPS.matcher(word).matches()) return topMatch("HTTPS");
     if (FYI.matcher(word).matches()) return topMatch("FYI");
+    if (HONGKONG.matcher(word).matches()) return topMatch("Hong Kong");
     if (TV.matcher(word).matches()) {
       List<SuggestedReplacement> l = new ArrayList<>();
       l.add(new SuggestedReplacement("TV"));

diff --git a/languagetool-language-modules/en/src/main/resources/org/languagetool/resource/en/added.txt b/languagetool-language-modules/en/src/main/resources/org/languagetool/resource/en/added.txt
@@ -35701,3 +35701,5 @@ handshook	handshake	VBN
 handshaking	handshake	VBG
 handshakes	handshake	VBZ
 IMAGO	IMAGO	NNP
+Vltava	Vltava	NNP
+Bishopsgate	Bishopsgate	NNP
diff --git a/...uagetool-language-modules/en/src/main/resources/org/languagetool/resource/en/en-US-GB.txt b/...uagetool-language-modules/en/src/main/resources/org/languagetool/resource/en/en-US-GB.txt
@@ -4803,4 +4803,5 @@ quettaliters;quettalitres
 quectoliter;quectolitre
 quectoliters;quectolitres
 laser-focused;laser-focussed
-colorings;colourings
+colorings;colourings
+brokerage;broking
diff --git a/...l-language-modules/en/src/main/resources/org/languagetool/resource/en/hunspell/ignore.txt b/...l-language-modules/en/src/main/resources/org/languagetool/resource/en/hunspell/ignore.txt
@@ -10220,3 +10220,11 @@ Teton
 Yoan
 Omelas
 acinous
+Wardley
+tael
+taels
+catchup
+catchups
+RxJS
+scikit-learn
+SageMaker