From 6a50e9d2171f00c53a257df732341b74b8dbbac6 Mon Sep 17 00:00:00 2001
From: Daniel Naber <naber@danielnaber.de>
Date: Thu, 16 Jan 2025 12:52:45 +0100
Subject: [PATCH] fix more cases as the one in #11189 and add check to prevent
 this issue

---
 .../patterns/FalseFriendRuleHandler.java      |  3 ++
 .../org/languagetool/rules/false-friends.xml  | 40 +++++--------------
 2 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/languagetool-core/src/main/java/org/languagetool/rules/patterns/FalseFriendRuleHandler.java b/languagetool-core/src/main/java/org/languagetool/rules/patterns/FalseFriendRuleHandler.java
index 1e51fa377cca..bcaf51de95a4 100644
--- a/languagetool-core/src/main/java/org/languagetool/rules/patterns/FalseFriendRuleHandler.java
+++ b/languagetool-core/src/main/java/org/languagetool/rules/patterns/FalseFriendRuleHandler.java
@@ -96,6 +96,9 @@ public void startElement(String namespaceURI, String lName,
       if (Languages.isLanguageSupported(languageStr)) {
         Language tmpLang = Languages.getLanguageForShortCode(languageStr);
         currentTranslationLanguage = tmpLang;
+        if (currentTranslationLanguage == language) {
+          throw new RuntimeException("Translation language (" + currentTranslationLanguage + ") must not be the same as pattern language (" + language + ") for rule " + id);
+        }
         if (tmpLang.equalsConsiderVariantsIfSpecified(motherTongue)) {
           translationLanguage = tmpLang;
         }
diff --git a/languagetool-core/src/main/resources/org/languagetool/rules/false-friends.xml b/languagetool-core/src/main/resources/org/languagetool/rules/false-friends.xml
index d1a7a966cb82..d0bcf05684d2 100644
--- a/languagetool-core/src/main/resources/org/languagetool/rules/false-friends.xml
+++ b/languagetool-core/src/main/resources/org/languagetool/rules/false-friends.xml
@@ -1661,12 +1661,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
             <translation lang="pt">acionar</translation>
             <translation lang="pt">motivar</translation>
         </rule>
-        <rule>
-            <pattern lang="de">
-                <token inflected="yes">actuar</token>
-            </pattern>
-            <translation lang="en">act</translation>
-        </rule>
         <rule>
             <pattern lang="pt">
                 <token inflected="yes">atuar</token>
@@ -3605,8 +3599,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
             <pattern lang="pl">
                 <token inflected="yes">bufon</token>
             </pattern>
-            <translation lang="pl">boaster</translation>
-            <translation lang="pl">braggart</translation>
+            <translation lang="en">boaster</translation>
+            <translation lang="en">braggart</translation>
         </rule>
     </rulegroup>
     <rulegroup id="BUFFOONERY">
@@ -3689,6 +3683,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
             <translation lang="pt">filho de uma cabra</translation>
         </rule>
     </rulegroup>
+    <!--
     <rulegroup id="CAÇAR">
         <rule>
             <pattern lang="pt">
@@ -3703,6 +3698,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
             <translation lang="es">casarse</translation>
         </rule>
     </rulegroup>
+    -->
     <rulegroup id="CACHO">
         <rule>
             <pattern lang="pt">
@@ -4534,6 +4530,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
             <translation lang="pt">pescoço</translation>
         </rule>
     </rulegroup>
+    <!--
     <rulegroup id="COLA">
         <rule>
             <pattern lang="es">
@@ -4548,6 +4545,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
             <translation lang="pt">pegamento</translation>
         </rule>
     </rulegroup>
+    -->
     <rulegroup id="COLCHÃO">
         <rule>
             <pattern lang="pt">
@@ -6103,7 +6101,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
             <pattern lang="it">
                 <token inflected="yes">educato</token>
             </pattern>
-            <translation lang="it">polite</translation>
+            <translation lang="en">polite</translation>
         </rule>
         <rule>
             <pattern lang="pt">
@@ -6123,7 +6121,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
             <pattern lang="pl">
                 <token inflected="yes">elewator</token>
             </pattern>
-            <translation lang="pl">(grain) elevator</translation>
+            <translation lang="en">(grain) elevator</translation>
         </rule>
     </rulegroup>
     <rulegroup id="EMBARAÇADA">
@@ -6188,7 +6186,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
                 <token inflected="yes">empeçar</token>
             </pattern>
             <translation lang="es">enredar</translation>
-            <translation lang="pt">dificultar</translation>
+            <translation lang="es">dificultar</translation>
         </rule>
         <rule>
             <pattern lang="es">
@@ -6353,7 +6351,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
                 <token inflected="yes">ermita</token>
             </pattern>
             <translation lang="es">ermitaño</translation>
-            <translation lang="pt">eremita</translation>
         </rule>
         <rule>
             <pattern lang="es">
@@ -8190,7 +8187,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
             <pattern lang="en">
                 <token>helm</token>
             </pattern>
-            <translation lang="en">tiller</translation>
             <translation lang="it">timone</translation>
             <translation lang="de">Ruder</translation>
             <translation lang="de">Steuer</translation>
@@ -9455,7 +9451,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
                 <token inflected="yes">mas</token>
             </pattern>
             <translation lang="es">pero</translation>
-            <translation lang="pt">mas</translation>
         </rule>
         <rule>
             <pattern lang="es">
@@ -9678,7 +9673,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
             <pattern lang="it">
                 <token>morbido</token>
             </pattern>
-            <translation lang="it">soft</translation>
             <translation lang="fr">souple</translation>
             <translation lang="de">weich</translation>
         </rule>
@@ -9900,7 +9894,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
                 <token inflected="yes">nota</token>
             </pattern>
             <translation lang="es">nota</translation>
-            <translation lang="pt">calificación</translation>
         </rule>
         <rule>
             <pattern lang="es">
@@ -10726,7 +10719,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
                 <token inflected="yes">perdigão</token>
             </pattern>
             <translation lang="es">perdigón</translation>
-            <translation lang="pt">pollo de la perdiz</translation>
         </rule>
         <rule>
             <pattern lang="es">
@@ -11496,7 +11488,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
                 <token inflected="yes">pronto</token>
             </pattern>
             <translation lang="es">listo</translation>
-            <translation lang="pt">terminado</translation>
         </rule>
         <rule>
             <pattern lang="es">
@@ -12445,7 +12436,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
                 <token inflected="yes">sala</token>
             </pattern>
             <translation lang="fr">salon</translation>
-            <translation lang="pt">salle</translation>
         </rule>
         <rule>
             <pattern lang="fr">
@@ -13098,13 +13088,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
             </pattern>
             <translation lang="pt">sofrer</translation>
         </rule>
-        <rule>
-            <pattern lang="pt">
-                <token inflected="yes" regexp='yes'>subir</token>
-            </pattern>
-            <translation lang="pt">augmenter</translation>
-            <translation lang="pt">monter</translation>
-        </rule>
     </rulegroup>
     <rulegroup id="SUBTÍTULO">
         <rule>
@@ -14018,7 +14001,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
             <pattern lang="fr">
                 <token inflected="yes">vers</token>
             </pattern>
-            <translation lang="fr">em direção a</translation>
             <translation lang="pt">vermes</translation>
             <translation lang="pt">verso</translation>
         </rule>
@@ -14241,8 +14223,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
             <pattern lang="en">
                 <token inflected="yes">wall</token>
             </pattern>
-            <translation lang="en">wand</translation>
-            <translation lang="en">muur</translation>
+            <translation lang="nl">wand</translation>
+            <translation lang="nl">muur</translation>
         </rule>
     </rulegroup>
     <rulegroup id="WAREHOUSE">