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 index 7099f6205d2f..156b95f78b4f 100644 --- a/languagetool-core/src/main/resources/org/languagetool/resource/spelling_global.txt +++ b/languagetool-core/src/main/resources/org/languagetool/resource/spelling_global.txt @@ -26865,6 +26865,17 @@ Apostolos Tzitzikostas Christophe Hansen Glenn Micallef Pam Bondi +Standard Oil +Oxford Circus +Oxford Street +Vinci Autoroutes +VINCI Autoroutes +Jardine Matheson +Dagens Nyheter +Opel Grandland +Vauxhall Grandland +Ko Samui +Koh Samui Qeshm Air Santiago Posteguillo Portia de Rossi diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/CompoundInfinitivRule.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/CompoundInfinitivRule.java index 0721f27b5588..57798a183530 100644 --- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/CompoundInfinitivRule.java +++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/CompoundInfinitivRule.java @@ -80,17 +80,68 @@ public class CompoundInfinitivRule extends Rule { token("an"), token("zu") ), - Arrays.asList( // "Hab keine Lust, mir Gedanken darüber zu machen." - token("Gedanken"), + Arrays.asList( tokenRegex("dazu|darüber"), token("zu"), token("machen") ), - Arrays.asList( // "um dort die Nacht über zu stehen." - tokenRegex("Spiel|Tag|Nacht|Morgen|Nachmittag|Abend|Zeit|.+zeit"), + Arrays.asList( + token("kurz"), + token("davor"), + token("zu") + ), + Arrays.asList( + tokenRegex("Jahr|Monat|Zeit"), token("über"), + token("zu") + ), + Arrays.asList( + token("endlich"), + token("wieder"), + token("zu") + ), + Arrays.asList( + token("bis"), + token("hin"), + token("zu") + ), + Arrays.asList( + token("von"), + tokenRegex(".*[a-z].*"), + token("her"), + token("zu") + ), + Arrays.asList( + tokenRegex("sehr|ganz|äu(ss|ß)erst|zu|nicht|absolut|total|wirklich|möglichst"), + posRegex("ADJ.*"), + token("zu") + ), + Arrays.asList( + token("Schritt"), + token("weiter"), + token("zu") + ), + Arrays.asList( + token("und"), + token("so"), + token("weiter") + ), + Arrays.asList( + token("darauf"), + token("zu"), + posRegex("VER.*"), + token("dass") + ), + Arrays.asList( + token("darauf"), token("zu"), - token("stehen") + posRegex("VER.*"), + token(",") + ), + Arrays.asList( // "um dort die Nacht über zu stehen." + tokenRegex("Spiel|Tag|Nacht|Morgen|Nachmittag|Abend|Zeit|.+zeit|Jahr(zehnt)?|Monat|.+tag|Mittwoch|Januar|Februar|März|April|Mai|Juni|Juli|August|September|Oktober|November|Dezember"), + token("über"), + token("zu") ), Arrays.asList( token("kurz"), @@ -117,6 +168,11 @@ public class CompoundInfinitivRule extends Rule { token("ab"), token("zu") ), + Arrays.asList( + token("zu"), + posRegex("ADJ.*"), + token("zu") + ), Arrays.asList( // "Hin und her zu laufen" token("hin"), @@ -163,8 +219,8 @@ private static PatternToken token(String s) { public CompoundInfinitivRule(ResourceBundle messages, Language lang, UserConfig userConfig) throws IOException { super.setCategory(Categories.COMPOUNDING.getCategory(messages)); setLocQualityIssueType(ITSIssueType.Misspelling); - addExamplePair(Example.wrong("Er überprüfte die Rechnungen noch einmal, um ganz sicher zu gehen."), - Example.fixed("Er überprüfte die Rechnungen noch einmal, um ganz sicherzugehen.")); + addExamplePair(Example.wrong("Er überprüfte die Rechnungen noch einmal, um sicher zu gehen."), + Example.fixed("Er überprüfte die Rechnungen noch einmal, um sicherzugehen.")); this.lang = lang; if (userConfig != null) { linguServices = userConfig.getLinguServices(); diff --git a/languagetool-language-modules/de/src/main/resources/org/languagetool/resource/de/hunspell/spelling.txt b/languagetool-language-modules/de/src/main/resources/org/languagetool/resource/de/hunspell/spelling.txt index 64396791aaa0..1b86c1347e17 100644 --- a/languagetool-language-modules/de/src/main/resources/org/languagetool/resource/de/hunspell/spelling.txt +++ b/languagetool-language-modules/de/src/main/resources/org/languagetool/resource/de/hunspell/spelling.txt @@ -17573,7 +17573,7 @@ Fixierungsprozess Fixierungsprozesse/NS Friedrichssegen/S #name gelingsicher/A -Granola #name +Granola/S #name Häkeltechnik Häkeltechniken Haeckel #name @@ -65357,6 +65357,32 @@ Prävalenzfehler/NS Kondensatwannenheizung Kondensatwannenheizungen Drehmomentschrauber/NS +rumkippeln +rumkippel +rumkippelst +rumkippelt +rumkippelte +rumkippelten +rumgekippelt +herumkippeln +herumkippel +herumkippelst +herumkippelt +herumkippelte +herumkippelten +herumgekippelt +purinreich/A +urinreich/A +Erzählcafé/S +Sprachmodell/S +Sprachmodelle/N +mit_meinen +verfassungsimmanent/A +wettbewerbsübergreifend/A +störungsresistent/A +Fasziitis +pronordkoreanisch/A +standortfeindlich/A Gymnastin Gymnastinnen Gewahrsamsbruch/S @@ -65405,6 +65431,7 @@ Längerfristigkeit straßenbündig/A Durchfahrtssperre/N Bøgseth/S +AnnenMayKantereit/S ein_trainieren eintrainiert/P Mittelblockerposition diff --git a/languagetool-language-modules/de/src/main/resources/org/languagetool/resource/de/multitoken-suggest.txt b/languagetool-language-modules/de/src/main/resources/org/languagetool/resource/de/multitoken-suggest.txt index 96e296e03aec..1fae4c5dcd96 100644 --- a/languagetool-language-modules/de/src/main/resources/org/languagetool/resource/de/multitoken-suggest.txt +++ b/languagetool-language-modules/de/src/main/resources/org/languagetool/resource/de/multitoken-suggest.txt @@ -3117,6 +3117,8 @@ Pete Hegseth/S #name Elise Stefanik/S #name Red Sweep/S Blue Sweep/S +Ko Samui/S +Koh Samui/S Ko Lanta/S Koh Lanta/S Ko Phangan/S 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 index d9a0a3bbe8f6..c86ba917270b 100644 --- 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 @@ -27273,6 +27273,57 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA nach zu + + reichen + aus + zu + + + kommen + komisch + vor + zu + + + sehr|ganz|äu(ß|ss)erst|zu|nicht|total|wirklich|absolut|möglichst + + zu + + + mit + zu + tun + + + von + aus + zu + + + ziehen + vor + zu + + + machen + auf + zu + + + Angst + vor + zu + + + vor + zu + haben + + + halten + ab + zu + @@ -27318,6 +27369,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA fürs ans mithilfe + kraft + oberhalb + unterhalb .*zeit zu diff --git a/languagetool-language-modules/en/src/main/resources/org/languagetool/resource/en/disambiguation.xml b/languagetool-language-modules/en/src/main/resources/org/languagetool/resource/en/disambiguation.xml index 14a1c4641506..533e5a9af21c 100644 --- a/languagetool-language-modules/en/src/main/resources/org/languagetool/resource/en/disambiguation.xml +++ b/languagetool-language-modules/en/src/main/resources/org/languagetool/resource/en/disambiguation.xml @@ -17151,4 +17151,23 @@ Incorrectly touched. Incorrect grammar. Those present + + + + + f + * + ck(s|ed|ing)? + + + + + + (bull)?sh + * + t + + + + diff --git a/languagetool-language-modules/en/src/main/resources/org/languagetool/resource/en/hunspell/ignore.txt b/languagetool-language-modules/en/src/main/resources/org/languagetool/resource/en/hunspell/ignore.txt index ab81db04423f..b3c034e0e781 100644 --- a/languagetool-language-modules/en/src/main/resources/org/languagetool/resource/en/hunspell/ignore.txt +++ b/languagetool-language-modules/en/src/main/resources/org/languagetool/resource/en/hunspell/ignore.txt @@ -10970,6 +10970,11 @@ hardcode hardcoded DPA DPAs +intl +decontrol +decontrols +decontrolled +decontrolling Swiftie Swifties Miraidon diff --git a/languagetool-language-modules/en/src/main/resources/org/languagetool/resource/en/hunspell/spelling.txt b/languagetool-language-modules/en/src/main/resources/org/languagetool/resource/en/hunspell/spelling.txt index 22500bf7405c..4642c79f5132 100644 --- a/languagetool-language-modules/en/src/main/resources/org/languagetool/resource/en/hunspell/spelling.txt +++ b/languagetool-language-modules/en/src/main/resources/org/languagetool/resource/en/hunspell/spelling.txt @@ -531,6 +531,8 @@ indemnifying indemnifies indemnifier indemnifiers +controllability +controlment organocatalyst organocatalysts organocatalysis diff --git a/languagetool-language-modules/en/src/main/resources/org/languagetool/rules/en/grammar.xml b/languagetool-language-modules/en/src/main/resources/org/languagetool/rules/en/grammar.xml index 812c697a90c4..cc1137ae4cd3 100644 --- a/languagetool-language-modules/en/src/main/resources/org/languagetool/rules/en/grammar.xml +++ b/languagetool-language-modules/en/src/main/resources/org/languagetool/rules/en/grammar.xml @@ -72199,7 +72199,7 @@ USA an? honors - thesis|major|student|graduate|class|degree|program|diploma|course + thesis|major|student|graduate|class|degree|program|diploma|course _