diff --git a/README.adoc b/README.adoc
index d9242dfe1..cc5eaed04 100644
--- a/README.adoc
+++ b/README.adoc
@@ -40,7 +40,7 @@ Likewise, the current version of wxPython, is 4.2.1, but RIDE is known to work w
 
 `pip install -U robotframework-ride`
 
-(3.8 <= python <= 3.12) Install current development version (**2.1dev76**) with:
+(3.8 <= python <= 3.12) Install current development version (**2.1dev77**) with:
 
 `pip install -U https://github.com/robotframework/RIDE/archive/master.zip`
 
diff --git a/src/robotide/application/releasenotes.py b/src/robotide/application/releasenotes.py
index 9701c362c..48ce31399 100644
--- a/src/robotide/application/releasenotes.py
+++ b/src/robotide/application/releasenotes.py
@@ -328,7 +328,7 @@ def set_content(self, html_win, content):
 <pre class="literal-block">
 python -m robotide.postinstall -install
 </pre>
-<p>RIDE {VERSION} was released on 06/September/2024.</p>
+<p>RIDE {VERSION} was released on 08/September/2024.</p>
 <!-- <br/>
 <h3>May The Fourth Be With You!</h3>
 <h3>Celebrate the bank holiday, 10th June, Day of Portugal, Portuguese Communities and Camões!!</h3>
diff --git a/src/robotide/editor/texteditor.py b/src/robotide/editor/texteditor.py
index f41fcb13f..be19ff164 100644
--- a/src/robotide/editor/texteditor.py
+++ b/src/robotide/editor/texteditor.py
@@ -16,6 +16,7 @@
 import os
 import re
 from io import StringIO, BytesIO
+from os.path import dirname
 from time import time
 
 import wx
@@ -59,6 +60,7 @@
 
 AUTO_SUGGESTIONS = 'enable auto suggestions'
 LANG_SETTING = 'Language: '
+PATH_EXCLUSIONS = dirname(__file__)
 PLUGIN_NAME = 'Text Edit'
 TOKEN_TXT = 'Token('
 TXT_NUM_SPACES = 'txt number of spaces'
@@ -109,19 +111,33 @@ def obtain_language(existing, content):
     return [set_lang[0]]
 
 
-def get_rf_lang_code(lang: (str, list)) -> str:
+def get_rf_lang_code(lang: (str, list), iso: bool=False) -> str:
     if isinstance(lang, list):
         clean_lang = lang
     else:
         clean_lang = lang.split(' ')  # The cases we have two words
     clean_lang = clean_lang[0].replace('-', '_').split('_')  # The cases we have variant code
     lc = len(clean_lang)
-    if lc == 1:
-        return clean_lang[0].title()
-    with_variant_code = f"{clean_lang[0].lower().title()}{clean_lang[1].lower().title()}"
-    if with_variant_code in ("PtBr", "ZhCn", "ZhTw"):
-        return with_variant_code
-    return clean_lang[0].title()
+    code = clean_lang[0].lower()
+    if not iso:
+        if lc == 1:
+            return code.title()
+        elif lc == 2:
+            with_variant_code = f"{code.title()}{clean_lang[1].lower().title()}"
+            if with_variant_code in ("PtBr", "ZhCn", "ZhTw") and not iso:
+                return with_variant_code
+    if iso:
+        variant = {"bs":"BA", "cs":"CZ", "da":"DK", "en":"US", "hi":"IN", "ja":"JP",
+                   "ko":"KR", "sv":"SE", "uk":"UA", "vi":"VN"}
+        code = clean_lang[0].lower()
+        if lc == 1:
+            if code in variant.keys():
+                return f"{code}_{variant[code].upper()}"
+            else:
+                return f"{code}_{code.upper()}"
+        else:
+            return f"{code}_{clean_lang[1].upper()}"
+    return code.title()
 
 
 def transform_doc_language(old_lang, new_lang, m_text, node_info: tuple = ('', )):
@@ -252,31 +268,40 @@ def transform_doc_language(old_lang, new_lang, m_text, node_info: tuple = ('', )
         m_text = re.sub(r"[*]+\s"+fr"{old}"+r"\s[*]+", fr"*** {new} ***", m_text)
     # Settings must be replaced individually
     # Order of replacements seems to be important
-    m_text = re.sub(fr'\b{old_documentation_setting}\b', fr'{new_documentation_setting}', m_text)
-    m_text = re.sub(fr'[[]{old_arguments_setting}]', fr'[{new_arguments_setting}]', m_text)
-    m_text = re.sub(fr'{old_suite_setup_setting}\s{2}', fr'{new_suite_setup_setting}  ', m_text)
-    m_text = re.sub(fr'{old_suite_teardown_setting}\s{2}', fr'{new_suite_teardown_setting}  ', m_text)
-    m_text = re.sub(fr'{old_test_setup_setting}\s{2}', fr'{new_test_setup_setting}  ', m_text)
-    m_text = re.sub(fr'{old_task_setup_setting}\s{2}', fr'{new_task_setup_setting}  ', m_text)
-    m_text = re.sub(fr'{old_template_setting}\s{2}', fr'{new_template_setting}  ', m_text)
-    m_text = re.sub(fr'{old_test_teardown_setting}\s{2}', fr'{new_test_teardown_setting}  ', m_text)
-    m_text = re.sub(fr'{old_task_teardown_setting}\s{2}', fr'{new_task_teardown_setting}  ', m_text)
-    m_text = re.sub(fr'{old_library_setting}\s{2}', fr'{new_library_setting}  ', m_text)
-    m_text = re.sub(fr'{old_resource_setting}\s{2}', fr'{new_resource_setting}  ', m_text)
-    m_text = re.sub(fr'{old_variables_setting}\s{2}', fr'{new_variables_setting}  ', m_text)
-    m_text = re.sub(fr'{old_tags_setting}\s{2}', fr'{new_tags_setting}  ', m_text)
-    m_text = re.sub(fr'[[]{old_setup_setting}]', fr'[{new_setup_setting}]', m_text)
-    m_text = re.sub(fr'[[]{old_teardown_setting}]', fr'[{new_teardown_setting}]', m_text)
-    m_text = re.sub(fr'\b{old_name_setting}\b', fr'{new_name_setting}', m_text)
-    m_text = re.sub(fr'\b{old_metadata_setting}\b', fr'{new_metadata_setting}', m_text)
-    m_text = re.sub(fr'\b{old_test_template_setting}\b', fr'{new_test_template_setting}', m_text)
-    m_text = re.sub(fr'\b{old_task_template_setting}\b', fr'{new_task_template_setting}', m_text)
-    m_text = re.sub(fr'[[]{old_test_tags_setting}]', fr'[{new_test_tags_setting}]', m_text)
-    m_text = re.sub(fr'[[]{old_task_tags_setting}]', fr'[{new_task_tags_setting}]', m_text)
-    m_text = re.sub(fr'[[]{old_keyword_tags_setting}]', fr'[{new_keyword_tags_setting}]', m_text)
-    m_text = re.sub(fr'\b{old_test_timeout_setting}\b', fr'{new_test_timeout_setting}', m_text)
-    m_text = re.sub(fr'\b{old_task_timeout_setting}\b', fr'{new_task_timeout_setting}', m_text)
-    m_text = re.sub(fr'\b{old_timeout_setting}\b', fr'{new_timeout_setting}', m_text)
+    m_text = re.sub(fr'^{old_library_setting}\b', fr'{new_library_setting}', m_text, flags=re.M)
+    m_text = re.sub(fr'^{old_resource_setting}\b', fr'{new_resource_setting}', m_text, flags=re.M)
+    m_text = re.sub(fr'^{old_variables_setting}\b', fr'{new_variables_setting}', m_text, flags=re.M)
+    m_text = re.sub(fr'^{old_documentation_setting}\b', fr'{new_documentation_setting}', m_text, flags=re.M)
+    m_text = re.sub(fr'\[{old_documentation_setting}]', fr'[{new_documentation_setting}]', m_text)
+    m_text = re.sub(fr'\[{old_arguments_setting}]', fr'[{new_arguments_setting}]', m_text)
+    m_text = re.sub(fr'^{old_test_timeout_setting}\b', fr'{new_test_timeout_setting}', m_text, flags=re.M)
+    m_text = re.sub(fr'^{old_task_timeout_setting}\b', fr'{new_task_timeout_setting}', m_text, flags=re.M)
+    m_text = re.sub(fr'^{old_suite_setup_setting}\b', fr'{new_suite_setup_setting}', m_text, flags=re.M)
+    m_text = re.sub(fr'^{old_suite_teardown_setting}\b', fr'{new_suite_teardown_setting}', m_text, flags=re.M)
+    m_text = re.sub(fr'^{old_test_setup_setting}\b', fr'{new_test_setup_setting}', m_text, flags=re.M)
+    m_text = re.sub(fr'^{old_task_setup_setting}\b', fr'{new_task_setup_setting}', m_text, flags=re.M)
+    m_text = re.sub(fr'\[{old_template_setting}]', fr'[{new_template_setting}]', m_text)
+    m_text = re.sub(fr'^{old_test_teardown_setting}\b', fr'{new_test_teardown_setting}', m_text, flags=re.M)
+    m_text = re.sub(fr'^{old_task_teardown_setting}\b', fr'{new_task_teardown_setting}', m_text, flags=re.M)
+    m_text = re.sub(fr'\[{old_tags_setting}]', fr'[{new_tags_setting}]', m_text)
+    m_text = re.sub(fr'\[{old_setup_setting}]', fr'[{new_setup_setting}]', m_text)
+    m_text = re.sub(fr'\[{old_teardown_setting}]', fr'[{new_teardown_setting}]', m_text)
+    m_text = re.sub(fr'^{old_metadata_setting}\b', fr'{new_metadata_setting}', m_text, flags=re.M)
+    m_text = re.sub(fr'^{old_test_template_setting}\b', fr'{new_test_template_setting}', m_text, flags=re.M)
+    m_text = re.sub(fr'^{old_task_template_setting}\b', fr'{new_task_template_setting}', m_text, flags=re.M)
+    m_text = re.sub(fr'\[{old_keyword_tags_setting}]', fr'[{new_keyword_tags_setting}]', m_text)
+    m_text = re.sub(fr'\[{old_timeout_setting}]', fr'[{new_timeout_setting}]', m_text)
+    m_text = re.sub(fr'^{old_test_tags_setting}\b', fr'{new_test_tags_setting}', m_text, flags=re.M)
+    m_text = re.sub(fr'^{old_task_tags_setting}\b', fr'{new_task_tags_setting}', m_text, flags=re.M)
+
+    # Only the False/True words will be replaced not positionally or bound by []
+    for old, new in zip(old_true_strings, new_true_strings):
+        m_text = re.sub(fr"\b{old}\b", fr"{new}", m_text)
+    for old, new in zip(old_false_strings, new_false_strings):
+        m_text = re.sub(fr"\b{old}\b", fr"{new}", m_text)
+    # At least in Portuguese No Operation would change to Não Operation,
+    # But Name would change to Nãome when should be Nome, so we do after false strings
+    m_text = re.sub(fr'^{old_name_setting}\b', fr'{new_name_setting}', m_text, flags=re.M)
 
     for old, new in zip(old_lang_given_prefixes, new_lang_given_prefixes):
         m_text = re.sub(r"\s{2}"+fr"{old}"+r"\s", fr"  {new} ", m_text)
@@ -288,21 +313,24 @@ def transform_doc_language(old_lang, new_lang, m_text, node_info: tuple = ('', )
         m_text = re.sub(r"\s{2}"+fr"{old}"+r"\s", fr"  {new} ", m_text)
     for old, new in zip(old_lang_but_prefixes, new_lang_but_prefixes):
         m_text = re.sub(r"\s{2}"+fr"{old}"+r"\s", fr"  {new} ", m_text)
-    for old, new in zip(old_true_strings, new_true_strings):
-        m_text = re.sub(r"\s{2}"+fr"{old}"+r"\s", fr"  {new} ", m_text)
-    for old, new in zip(old_false_strings, new_false_strings):
-        m_text = re.sub(r"\s{2}"+fr"{old}"+r"\s", fr"  {new} ", m_text)
+
+    """
     # Final translation from English
     for en, new in zip(en_lang_given_prefixes, new_lang_given_prefixes):
-        m_text = re.sub(r"\s{2}"+fr"{en}"+r"\s", fr"  {new} ", m_text)
+        m_text = re.sub(r"\s{2}"+fr"{en}"+r"\s", fr"  {new} ", m_text, flags=re.I)
     for en, new in zip(en_lang_when_prefixes, new_lang_when_prefixes):
-        m_text = re.sub(r"\s{2}"+fr"{en}"+r"\s", fr"  {new} ", m_text)
+        m_text = re.sub(r"\s{2}"+fr"{en}"+r"\s", fr"  {new} ", m_text, flags=re.I)
     for en, new in zip(en_lang_then_prefixes, new_lang_then_prefixes):
-        m_text = re.sub(r"\s{2}"+fr"{en}"+r"\s", fr"  {new} ", m_text)
+        m_text = re.sub(r"\s{2}"+fr"{en}"+r"\s", fr"  {new} ", m_text, flags=re.I)
     for en, new in zip(en_lang_and_prefixes, new_lang_and_prefixes):
-        m_text = re.sub(r"\s{2}"+fr"{en}"+r"\s", fr"  {new} ", m_text)
+        m_text = re.sub(r"\s{2}"+fr"{en}"+r"\s", fr"  {new} ", m_text, flags=re.I)
     for en, new in zip(en_lang_but_prefixes, new_lang_but_prefixes):
-        m_text = re.sub(r"\s{2}"+fr"{en}"+r"\s", fr"  {new} ", m_text)
+        m_text = re.sub(r"\s{2}"+fr"{en}"+r"\s", fr"  {new} ", m_text, flags=re.I)
+    """
+
+    # Before ending, we replace broken keywords from excluded known bad tanslations
+    m_text = transform_standard_keywords(new_lang_name, m_text)
+    # print(f"DEBUG: texteditor.py transform_doc_language {m_text=}")
 
     if sinal_correct_language:
         m_text = m_text.replace(fr'{LANG_SETTING}English', fr'{LANG_SETTING}{new_lang_name}')
@@ -320,6 +348,41 @@ def transform_doc_language(old_lang, new_lang, m_text, node_info: tuple = ('', )
         set_lang[0] = 'en'
     return m_text
 
+def transform_standard_keywords(new_lang: str, content: str) -> str:
+    """
+    This function must be called after proper setting of parameters old_lang, new_lang. From transform_doc_language.
+    It reads the corresponding new_lang exclusion file and does the replacing.
+    :param new_lang: Name of the language to correct
+    :param content: Content to apply recovery of keywords
+    :return: Corrected test suite content with English keywords from Standard libraries
+    """
+    try:
+        mlang = Language.from_name(new_lang.replace('_', '-'))
+        lang_code = get_rf_lang_code(mlang.code, iso=True)
+    except ValueError:
+        return content
+
+    path_to_exclusion = f"{PATH_EXCLUSIONS}/../localization/{lang_code}/restore_keywords.json"
+    # print(f"DEBUG: texteditor.py transform_standard_keywords path={path_to_exclusion}\n"
+    #       f"{lang_code=}\n"
+    #       f"{mlang.code=}")
+    import json
+
+    try:
+        with open(path_to_exclusion) as file:
+            data = json.load(file)
+    except FileNotFoundError:
+        return content
+
+    fix_list = data['fix_list']
+    if len(fix_list) == 0:
+        return content
+    # print(f"DEBUG: texteditor.py transform_standard_keywords my_variable={fix_list}")
+    for kw in fix_list:
+        # print(f"DEBUG: texteditor.py transform_standard_keywords kws BAD={kw[1]} GOOD={kw[0]}")
+        content = re.sub(fr'\b{kw[1]}\b', fr'{kw[0]}', content)
+    return content
+
 
 class TextEditorPlugin(Plugin, TreeAwarePluginMixin):
     title = PLUGIN_NAME
diff --git a/src/robotide/localization/bg_BG/restore_keywords.json b/src/robotide/localization/bg_BG/restore_keywords.json
new file mode 100644
index 000000000..3ef901f0c
--- /dev/null
+++ b/src/robotide/localization/bg_BG/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "Не Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue Включен Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn Включен Failure"],
+["Should Be True", "Should Be Вярно"],
+["Should Not Be True", "Should Not Be Вярно"]
+]
+}
+
diff --git a/src/robotide/localization/cs_CZ/restore_keywords.json b/src/robotide/localization/cs_CZ/restore_keywords.json
new file mode 100644
index 000000000..cf25f2b88
--- /dev/null
+++ b/src/robotide/localization/cs_CZ/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "Ne Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue Zapnuto Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn Zapnuto Failure"],
+["Should Be True", "Should Be Pravda"],
+["Should Not Be True", "Should Not Be Pravda"]
+]
+}
+
diff --git a/src/robotide/localization/de_DE/restore_keywords.json b/src/robotide/localization/de_DE/restore_keywords.json
new file mode 100644
index 000000000..41e236aa5
--- /dev/null
+++ b/src/robotide/localization/de_DE/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "Nein Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue An Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn An Failure"],
+["Should Be True", "Should Be Wahr"],
+["Should Not Be True", "Should Not Be Wahr"]
+]
+}
+
diff --git a/src/robotide/localization/es_ES/restore_keywords.json b/src/robotide/localization/es_ES/restore_keywords.json
new file mode 100644
index 000000000..549b0d8a6
--- /dev/null
+++ b/src/robotide/localization/es_ES/restore_keywords.json
@@ -0,0 +1,7 @@
+{
+"fix_list":[
+["Should Be True", "Should Be Verdadero"],
+["Should Not Be True", "Should Not Be Verdadero"]
+]
+}
+
diff --git a/src/robotide/localization/fi_FI/restore_keywords.json b/src/robotide/localization/fi_FI/restore_keywords.json
new file mode 100644
index 000000000..c7e660eae
--- /dev/null
+++ b/src/robotide/localization/fi_FI/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "Ei Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue Päällä Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn Päällä Failure"],
+["Should Be True", "Should Be Tosi"],
+["Should Not Be True", "Should Not Be Tosi"]
+]
+}
+
diff --git a/src/robotide/localization/fr_FR/restore_keywords.json b/src/robotide/localization/fr_FR/restore_keywords.json
new file mode 100644
index 000000000..b8a38bd73
--- /dev/null
+++ b/src/robotide/localization/fr_FR/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "Non Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue Actif Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn Actif Failure"],
+["Should Be True", "Should Be Vrai"],
+["Should Not Be True", "Should Not Be Vrai"]
+]
+}
+
diff --git a/src/robotide/localization/hi_IN/restore_keywords.json b/src/robotide/localization/hi_IN/restore_keywords.json
new file mode 100644
index 000000000..8cc65e708
--- /dev/null
+++ b/src/robotide/localization/hi_IN/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "नहीं Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue हां Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn हां Failure"],
+["Should Be True", "Should Be यथार्थ"],
+["Should Not Be True", "Should Not Be यथार्थ"]
+]
+}
+
diff --git a/src/robotide/localization/it_IT/restore_keywords.json b/src/robotide/localization/it_IT/restore_keywords.json
new file mode 100644
index 000000000..b2dd42518
--- /dev/null
+++ b/src/robotide/localization/it_IT/restore_keywords.json
@@ -0,0 +1,7 @@
+{
+"fix_list":[
+["Should Be True", "Should Be Vero"],
+["Should Not Be True", "Should Not Be Vero"]
+]
+}
+
diff --git a/src/robotide/localization/ja_JP/restore_keywords.json b/src/robotide/localization/ja_JP/restore_keywords.json
new file mode 100644
index 000000000..faeccbdee
--- /dev/null
+++ b/src/robotide/localization/ja_JP/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "無効 Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue はい Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn はい Failure"],
+["Should Be True", "Should Be 真"],
+["Should Not Be True", "Should Not Be 真"]
+]
+}
+
diff --git a/src/robotide/localization/ko_KR/restore_keywords.json b/src/robotide/localization/ko_KR/restore_keywords.json
new file mode 100644
index 000000000..aa1fd4792
--- /dev/null
+++ b/src/robotide/localization/ko_KR/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "아니오 Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue 켜기 Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn 켜기 Failure"],
+["Should Be True", "Should Be 참"],
+["Should Not Be True", "Should Not Be 참"]
+]
+}
+
diff --git a/src/robotide/localization/nl_NL/restore_keywords.json b/src/robotide/localization/nl_NL/restore_keywords.json
new file mode 100644
index 000000000..27510844d
--- /dev/null
+++ b/src/robotide/localization/nl_NL/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "Nee Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue Aan Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn Aan Failure"],
+["Should Be True", "Should Be Waar"],
+["Should Not Be True", "Should Not Be Waar"]
+]
+}
+
diff --git a/src/robotide/localization/pl_PL/restore_keywords.json b/src/robotide/localization/pl_PL/restore_keywords.json
new file mode 100644
index 000000000..ff1b3067b
--- /dev/null
+++ b/src/robotide/localization/pl_PL/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "Nie Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue Włączone Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn Włączone Failure"],
+["Should Be True", "Should Be Prawda"],
+["Should Not Be True", "Should Not Be Prawda"]
+]
+}
+
diff --git a/src/robotide/localization/pt_BR/restore_keywords.json b/src/robotide/localization/pt_BR/restore_keywords.json
new file mode 100644
index 000000000..ba2026b75
--- /dev/null
+++ b/src/robotide/localization/pt_BR/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "Não Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue Sim Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn Sim Failure"],
+["Should Be True", "Should Be Verdadeiro"],
+["Should Not Be True", "Should Not Be Verdadeiro"]
+]
+}
+
diff --git a/src/robotide/localization/pt_PT/restore_keywords.json b/src/robotide/localization/pt_PT/restore_keywords.json
new file mode 100644
index 000000000..ba2026b75
--- /dev/null
+++ b/src/robotide/localization/pt_PT/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "Não Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue Sim Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn Sim Failure"],
+["Should Be True", "Should Be Verdadeiro"],
+["Should Not Be True", "Should Not Be Verdadeiro"]
+]
+}
+
diff --git a/src/robotide/localization/ro_RO/restore_keywords.json b/src/robotide/localization/ro_RO/restore_keywords.json
new file mode 100644
index 000000000..37f94057a
--- /dev/null
+++ b/src/robotide/localization/ro_RO/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "Nu Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue Cand Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn Cand Failure"],
+["Should Be True", "Should Be Adevarat"],
+["Should Not Be True", "Should Not Be Adevarat"]
+]
+}
+
diff --git a/src/robotide/localization/sv_SE/restore_keywords.json b/src/robotide/localization/sv_SE/restore_keywords.json
new file mode 100644
index 000000000..1bef09a21
--- /dev/null
+++ b/src/robotide/localization/sv_SE/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "Nej Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue På Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn På Failure"],
+["Should Be True", "Should Be Sant"],
+["Should Not Be True", "Should Not Be Sant"]
+]
+}
+
diff --git a/src/robotide/localization/tr_TR/restore_keywords.json b/src/robotide/localization/tr_TR/restore_keywords.json
new file mode 100644
index 000000000..1c2da0825
--- /dev/null
+++ b/src/robotide/localization/tr_TR/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "Hayir Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue Açik Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn Açik Failure"],
+["Should Be True", "Should Be Doğru"],
+["Should Not Be True", "Should Not Be Doğru"]
+]
+}
+
diff --git a/src/robotide/localization/vi_VN/restore_keywords.json b/src/robotide/localization/vi_VN/restore_keywords.json
new file mode 100644
index 000000000..1b5a329a5
--- /dev/null
+++ b/src/robotide/localization/vi_VN/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "Không Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue Mở Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn Mở Failure"],
+["Should Be True", "Should Be Đúng"],
+["Should Not Be True", "Should Not Be Đúng"]
+]
+}
+
diff --git a/src/robotide/localization/zh_CN/restore_keywords.json b/src/robotide/localization/zh_CN/restore_keywords.json
new file mode 100644
index 000000000..cc90c0324
--- /dev/null
+++ b/src/robotide/localization/zh_CN/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "否 Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue 开 Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn 开 Failure"],
+["Should Be True", "Should Be 真"],
+["Should Not Be True", "Should Not Be 真"]
+]
+}
+
diff --git a/src/robotide/localization/zh_TW/restore_keywords.json b/src/robotide/localization/zh_TW/restore_keywords.json
new file mode 100644
index 000000000..bb9b0b6f9
--- /dev/null
+++ b/src/robotide/localization/zh_TW/restore_keywords.json
@@ -0,0 +1,10 @@
+{
+"fix_list":[
+["No Operation", "否 Operation"],
+["Run Keyword And Continue On Failure", "Run Keyword And Continue 開 Failure"],
+["Run Keyword And Warn On Failure", "Run Keyword And Warn 開 Failure"],
+["Should Be True", "Should Be 真"],
+["Should Not Be True", "Should Not Be 真"]
+]
+}
+
diff --git a/src/robotide/version.py b/src/robotide/version.py
index eca40502c..1e9c69536 100644
--- a/src/robotide/version.py
+++ b/src/robotide/version.py
@@ -15,4 +15,4 @@
 #
 # Automatically generated by `tasks.py`.
 
-VERSION = 'v2.1dev76'
+VERSION = 'v2.1dev77'
diff --git a/utest/editor/test_texteditor.py b/utest/editor/test_texteditor.py
index f0bfa8c14..5806e7e7b 100644
--- a/utest/editor/test_texteditor.py
+++ b/utest/editor/test_texteditor.py
@@ -53,7 +53,7 @@
              ('Finnish', 'fi'), ('French', 'fr'),
              ('Hindi', 'hi'), ('Italian', 'it'),
              ('Japanese', 'ja'), # Since RF 7.0.1
-             # Not available yet: ('Korean', 'ko'),  # Future RF after 7.0.1
+             ('Korean', 'ko'),  # Since RF 7.1
              ('Dutch', 'nl'), ('Polish', 'pl'),
              ('Portuguese', 'pt'),
              ('Brazilian Portuguese', 'pt-BR'),
@@ -765,12 +765,55 @@ def test_transform_doc_language_in_error(self):
                                                     " nor importable as a language module.\")"))
         finaltext = re.sub('Language: .*', fr'Language: Italian  # Klingon', fulltext, count=1)
 
+        # DEBUG: Write to file
+        with open(datafilereader.VALID_LANG_IT + ".temporary", "w") as fp:
+            fp.writelines(finaltext)
+
         # print(f"DEBUG: {result=} \n {finaltext=}.")
         assert result == finaltext
 
-    def test_transform_doc_language_spanish(self):
+
+    def test_transform_doc_list_of_standard_kws(self):
+
+        # Obtain list of keyword names
+        from subprocess import run
+        # We will only consider the ones with differences, below is the complete set
+        # libraries = "BuiltIn Collections DateTime Dialogs OperatingSystem Process Screenshot String Telnet XML"
+        libraries = "BuiltIn"
+        for lib in libraries.split():
+            output = run(['libdoc', lib, 'list'], capture_output=True)
+            with open(f"/tmp/{lib}.list", "w") as fp:
+               fp.write(f"{output.stdout.decode('utf-8')}")
+
         self.plugin._open()
-        with open(datafilereader.VALID_LANG_EN, "r") as fp:
+        for lib in libraries.split():
+            with open(f"/tmp/{lib}.list", "r") as fp:
+                file_content = fp.read()
+            self.plugin._editor_component.source_editor.set_text(file_content)
+            # print(f"DEBUG: content:\n{content}")
+            self.set_language('English')
+            fulltext = self.plugin._editor_component.source_editor.GetText()
+            for lang in LANGUAGES:
+                result = texteditor.transform_doc_language(['English'], [lang[0]], fulltext)
+                with open(f"/tmp/{lib}_{lang[0]}.list", "w") as fp:
+                    fp.writelines(result)
+
+        # Analysis of results
+        from difflib import unified_diff
+        for lib in libraries.split():
+            with open(f"/tmp/{lib}.list", "r") as f:
+                expected_lines = f.readlines()
+            for lang in LANGUAGES:
+                with open(f"/tmp/{lib}_{lang[0]}.list", "r") as f:
+                    actual_lines = f.readlines()
+                diff = list(unified_diff(expected_lines, actual_lines[2:]))  # Removed the Language setting
+                # print(f"TestLanguageFunctions: Standard Keywords {lib} lang={lang[0]} Diff:\n"
+                #       f"{''.join(diff)}")
+                assert diff == [], "Unexpected file contents:\n" + "".join(diff)
+
+    def test_transform_dummy_doc_language_spanish(self):
+        self.plugin._open()
+        with open(datafilereader.DUMMY_LANG + ".robot", "r") as fp:
             content = fp.readlines()
         content = "".join(content)
         self.plugin._editor_component.source_editor.set_text(content)
@@ -780,6 +823,53 @@ def test_transform_doc_language_spanish(self):
         fulltext = self.plugin._editor_component.source_editor.GetText()
         result = texteditor.transform_doc_language(['English'], ['Spanish'], fulltext)
 
+        # DEBUG: Write to file
+        with open(datafilereader.DUMMY_LANG + "_es.robot" + ".temporary", "w") as fp:
+            fp.writelines(result)
+
+        from difflib import unified_diff
+        with open(datafilereader.DUMMY_LANG + "_es.robot", "r") as f:
+            expected_lines = f.readlines()
+        with open(datafilereader.DUMMY_LANG + "_es.robot" + ".temporary", "r") as f:
+            actual_lines = f.readlines()
+
+        diff = list(unified_diff(expected_lines, actual_lines))
+        assert diff == [], "Unexpected file contents:\n" + "".join(diff)
+
+    def test_transform_dummy_doc_language_portuguese(self):
+        self.plugin._open()
+        with open(datafilereader.DUMMY_LANG + ".robot", "r") as fp:
+            content = fp.readlines()
+        content = "".join(content)
+        self.plugin._editor_component.source_editor.set_text(content)
+        # print(f"DEBUG: content:\n{content}")
+
+        fulltext = self.plugin._editor_component.source_editor.GetText()
+        result = texteditor.transform_doc_language(['English'], ['Portuguese'], fulltext)
+
+        # DEBUG: Write to file
+        with open(datafilereader.DUMMY_LANG + "_pt.robot" + ".temporary", "w") as fp:
+            fp.writelines(result)
+
+        from difflib import unified_diff
+        with open(datafilereader.DUMMY_LANG + "_pt.robot", "r") as f:
+            expected_lines = f.readlines()
+        with open(datafilereader.DUMMY_LANG + "_pt.robot" + ".temporary", "r") as f:
+            actual_lines = f.readlines()
+
+        diff = list(unified_diff(expected_lines, actual_lines))
+        assert diff == [], "Unexpected file contents:\n" + "".join(diff)
+
+    def test_transform_doc_language_spanish(self):
+        self.plugin._open()
+        with open(datafilereader.VALID_LANG_EN, "r") as fp:
+            content = fp.readlines()
+        content = "".join(content)
+        self.plugin._editor_component.source_editor.set_text(content)
+
+        fulltext = self.plugin._editor_component.source_editor.GetText()
+        result = texteditor.transform_doc_language(['English'], ['Spanish'], fulltext)
+
         # DEBUG: Write to file
         with open(datafilereader.VALID_LANG_ES + ".temporary", "w") as fp:
             fp.writelines(result)
@@ -787,9 +877,9 @@ def test_transform_doc_language_spanish(self):
         with open(datafilereader.VALID_LANG_ES, "r") as fp:
             content = fp.readlines()
         content = "".join(content)
-        print(f"DEBUG: They should be equal:\n"
-              f" {result=}\n"
-              f"{content=}")
+        # print(f"DEBUG: They should be equal:\n"
+        #       f" {result=}\n"
+        #       f"{content=}")
         assert result == content
 
     def test_transform_doc_language_portuguese(self):
@@ -809,9 +899,9 @@ def test_transform_doc_language_portuguese(self):
         with open(datafilereader.VALID_LANG_PT, "r") as fp:
             content = fp.readlines()
         content = "".join(content)
-        print(f"DEBUG: They should be equal:\n"
-              f" {result=}\n"
-              f"{content=}")
+        # print(f"DEBUG: They should be equal:\n"
+        #       f" {result=}\n"
+        #       f"{content=}")
         assert result == content
 
     """
@@ -825,13 +915,12 @@ def test_transform_doc_language_generate(self):
 
         # self.set_language('English')
         fulltext = self.plugin._editor_component.source_editor.GetText()
-        result = texteditor.transform_doc_language(['English'], ['Japanese'], fulltext)
-        print(f"DEBUG: This should be Japanese:\n"
+        result = texteditor.transform_doc_language(['English'], ['Italian'], fulltext)
+        print(f"DEBUG: This should be Italian:\n"
               f"{result=}")
-        with open(datafilereader.VALID_LANG_JA, "w") as fp:
+        with open(datafilereader.VALID_LANG_IT, "w") as fp:
             fp.writelines(result)
     """
 
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/utest/resources/datafilereader.py b/utest/resources/datafilereader.py
index 5e9d9b24a..b22f433dc 100644
--- a/utest/resources/datafilereader.py
+++ b/utest/resources/datafilereader.py
@@ -69,6 +69,7 @@ def _makepath(*elements):
 
 PREAMBLE_NO_LANG = _makepath('language', 'preamble_no_lang.robot')
 PREAMBLE_UNKNOWN_LANG = _makepath('language', 'preamble_unknown_lang.robot')
+DUMMY_LANG = _makepath('language', 'dummy')
 VALID_LANG_BG = _makepath('language', 'lang_bg.robot')
 VALID_LANG_BS = _makepath('language', 'lang_bs.robot')
 VALID_LANG_CS = _makepath('language', 'lang_cs.robot')
diff --git a/utest/resources/robotdata/language/dummy.robot b/utest/resources/robotdata/language/dummy.robot
new file mode 100644
index 000000000..35b3d0836
--- /dev/null
+++ b/utest/resources/robotdata/language/dummy.robot
@@ -0,0 +1,87 @@
+# This is a dummy file to be translated, without caring for validation.
+Language: English
+
+*** Settings ***
+Library           Process
+Library           OperatingSystem    AS    OS
+Resource          my_resource.resource
+Variables         my_variables.py
+Documentation     This is the documentation 1st line.
+...               Second line of documentation.
+Metadata          NewData    NewValue
+Name              This is the test suite name
+Suite Setup       Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Suite Teardown    Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Test Setup        Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Task Setup        Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Test Teardown     Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Task Teardown     Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Test Template     Example Template
+Task Template     Example Template
+Test Timeout      5 seconds
+Task Timeout      5 seconds
+Test Tags         one    two    three
+Task Tags         four    five    six
+
+*** Variables ***
+${m scalar}=      abc
+@{m list}         cde    123    ${456}    ${7.89101}
+&{m dict}=        a=a1    b=b2    c=c3
+  
+*** Test Cases ***
+My first test
+    [Tags]    one    two
+    [Timeout]    10 seconds
+    [Documentation]     This is the documentation 1st line.
+    ...
+    ...               Second line of documentation after empty line.
+    No Operation
+    # The word no is in logic values and is translated.
+    
+*** Tasks ***
+My first task
+    [Documentation]     This is the documentation 1st line.
+    ...
+    ...               Second line of documentation after empty line.
+    [Template]    Example Template
+    data    values
+    type    data
+    name    first
+    
+*** Comments ***
+Fist line of comment.
+Second line of comment.
+
+*** Keywords ***
+Example Template
+   [Keyword Tags]    k_one    k_two
+   [Setup]    Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+   ...      Third    arg4
+   [Teardown]    Log    This is a log step
+   [Documentation]     This is the documentation 1st line.
+    ...
+    ...               Second line of documentation after empty line.
+   [Arguments]   ${arg1}=test    ${arg2}=123
+   Log    ${arg1} ${arg2}
+
+My Gherkin Keyword
+    Given a sentence
+    When it makes sense
+    Then there is some meaning
+    And we can learn something
+    But it may not be useful.
+
+My Logical Keyword
+    FOR    ${logical}    IN    True    Yes    On
+         Log    ${logical}
+    END
+    FOR    ${logical}    IN    False    No    Off
+         Log    ${logical}
+    END    
+
diff --git a/utest/resources/robotdata/language/dummy_es.robot b/utest/resources/robotdata/language/dummy_es.robot
new file mode 100644
index 000000000..9693d2751
--- /dev/null
+++ b/utest/resources/robotdata/language/dummy_es.robot
@@ -0,0 +1,87 @@
+# This is a dummy file to be translated, without caring for validation.
+Language: Spanish
+
+*** Configuraciones ***
+Biblioteca           Process
+Biblioteca           OperatingSystem    AS    OS
+Recursos          my_resource.resource
+Variable         my_variables.py
+Documentación     This is the documentation 1st line.
+...               Second line of documentation.
+Metadatos          NewData    NewValue
+Nombre              This is the test suite name
+Configuración de la Suite       Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Desmontaje de la Suite    Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Configuración de prueba        Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Configuración de tarea        Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Desmontaje de la prueba     Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Desmontaje de tareas     Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Plantilla de prueba     Example Template
+Plantilla de tareas     Example Template
+Tiempo de espera de la prueba      5 seconds
+Tiempo de espera de las tareas      5 seconds
+Etiquetas de la prueba         one    two    three
+Etiquetas de las tareas         four    five    six
+
+*** Variables ***
+${m scalar}=      abc
+@{m list}         cde    123    ${456}    ${7.89101}
+&{m dict}=        a=a1    b=b2    c=c3
+  
+*** Casos de prueba ***
+My first test
+    [Etiquetas]    one    two
+    [Tiempo agotado]    10 seconds
+    [Documentación]     This is the documentation 1st line.
+    ...
+    ...               Second line of documentation after empty line.
+    No Operation
+    # The word no is in logic values and is translated.
+    
+*** Tareas ***
+My first task
+    [Documentación]     This is the documentation 1st line.
+    ...
+    ...               Second line of documentation after empty line.
+    [Plantilla]    Example Template
+    data    values
+    type    data
+    name    first
+    
+*** Comentarios ***
+Fist line of comment.
+Second line of comment.
+
+*** Palabras clave ***
+Example Template
+   [Etiquetas de palabras clave]    k_one    k_two
+   [Configuración]    Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+   ...      Third    arg4
+   [Desmontaje]    Log    This is a log step
+   [Documentación]     This is the documentation 1st line.
+    ...
+    ...               Second line of documentation after empty line.
+   [Argumentos]   ${arg1}=test    ${arg2}=123
+   Log    ${arg1} ${arg2}
+
+My Gherkin Keyword
+    Dado a sentence
+    Cuando it makes sense
+    Entonces there is some meaning
+    Y we can learn something
+    Pero it may not be useful.
+
+My Logical Keyword
+    FOR    ${logical}    IN    Verdadero    Si    On
+         Log    ${logical}
+    END
+    FOR    ${logical}    IN    Falso    No    Off
+         Log    ${logical}
+    END    
+
diff --git a/utest/resources/robotdata/language/dummy_pt.robot b/utest/resources/robotdata/language/dummy_pt.robot
new file mode 100644
index 000000000..8d79d5d55
--- /dev/null
+++ b/utest/resources/robotdata/language/dummy_pt.robot
@@ -0,0 +1,87 @@
+# This is a dummy file to be translated, without caring for validation.
+Language: Portuguese
+
+*** Definições ***
+Biblioteca           Process
+Biblioteca           OperatingSystem    AS    OS
+Recurso          my_resource.resource
+Variável         my_variables.py
+Documentação     This is the documentation 1st line.
+...               Second line of documentation.
+Metadados          NewData    NewValue
+Nome              This is the test suite name
+Inicialização de Suíte       Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Finalização de Suíte    Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Inicialização de Teste        Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Inicialização de Tarefa        Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Finalização de Teste     Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Finalização de Tarefa     Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+...               Third    arg4
+Modelo de Teste     Example Template
+Modelo de Tarefa     Example Template
+Tempo Limite de Teste      5 seconds
+Tempo Limite de Tarefa      5 seconds
+Etiquetas de Testes         one    two    three
+Etiquetas de Tarefas         four    five    six
+
+*** Variáveis ***
+${m scalar}=      abc
+@{m list}         cde    123    ${456}    ${7.89101}
+&{m dict}=        a=a1    b=b2    c=c3
+  
+*** Casos de Teste ***
+My first test
+    [Etiquetas]    one    two
+    [Tempo Limite]    10 seconds
+    [Documentação]     This is the documentation 1st line.
+    ...
+    ...               Second line of documentation after empty line.
+    No Operation
+    # The word no is in logic values and is translated.
+    
+*** Tarefas ***
+My first task
+    [Documentação]     This is the documentation 1st line.
+    ...
+    ...               Second line of documentation after empty line.
+    [Modelo]    Example Template
+    data    values
+    type    data
+    name    first
+    
+*** Comentários ***
+Fist line of comment.
+Second line of comment.
+
+*** Palavras-Chave ***
+Example Template
+   [Etiquetas de Palavras-Chave]    k_one    k_two
+   [Inicialização]    Run Keywords    First     arg1    AND    Second    arg2    arg3    AND
+   ...      Third    arg4
+   [Finalização]    Log    This is a log step
+   [Documentação]     This is the documentation 1st line.
+    ...
+    ...               Second line of documentation after empty line.
+   [Argumentos]   ${arg1}=test    ${arg2}=123
+   Log    ${arg1} ${arg2}
+
+My Gherkin Keyword
+    Dado a sentence
+    Quando it makes sense
+    Então there is some meaning
+    E we can learn something
+    Mas it may not be useful.
+
+My Logical Keyword
+    FOR    ${logical}    IN    Verdadeiro    Verdade    Sim
+         Log    ${logical}
+    END
+    FOR    ${logical}    IN    Falso    Não    Desligado
+         Log    ${logical}
+    END    
+
diff --git a/utest/resources/robotdata/language/lang_es.robot b/utest/resources/robotdata/language/lang_es.robot
index af405d6ab..97537489a 100644
--- a/utest/resources/robotdata/language/lang_es.robot
+++ b/utest/resources/robotdata/language/lang_es.robot
@@ -7,20 +7,21 @@ Language: Spanish
 Documentación     This test data file is used in *RobotIDE* _integration_ tests.
 ...               1-This is another line of the documentation
 ...               2-A continued line of documentation
-Configuración de la Suite    Run Keywords    Log To Console    Suite Setup
+Configuración de la Suite       Run Keywords    Log To Console    Suite Setup
 ...               AND    Log    Test
 ...               AND    Log to Console    Test
 ...               AND    My Suite Setup
 Desmontaje de la Suite    My Suite Teardown    ${scalar}    @{LIST}
-Configuración de prueba    My Test Setup
-Etiquetas de la prueba    new_tag    ride    regeression    # Comment on Tags
-Metadatos         My Meta    data
-Biblioteca        seleniumlibrary    # Purposefully wrong case | |
-Biblioteca        Process    # This is a comment
+Configuración de prueba        My Test Setup
+Desmontaje de la prueba     My Overriding Test Teardown
+Etiquetas de la prueba         new_tag    ride    regeression    # Comment on Tags
+Metadatos          My Meta    data
+Biblioteca           seleniumlibrary    # Purposefully wrong case | |
+Biblioteca           Process    # This is a comment
 Recursos          en/full_en.resource
-Biblioteca        LibSpecLibrary
-Biblioteca        ${LIB NAME}
-Biblioteca        ArgLib    ${ARG}
+Biblioteca           LibSpecLibrary
+Biblioteca           ${LIB NAME}
+Biblioteca           ArgLib    ${ARG}
 Recursos          ../resources/resource.resource
 Recursos          ../resources/resource2.robot
 Recursos          PathResource.robot
@@ -28,14 +29,14 @@ Recursos          ../resources/resource.robot
 Recursos          ${RES_PATH}/another_resource.robot
 Recursos          ${RES_PATH}/more_resources/${RES NAME}
 Recursos          ${RES_PATH}/more_resources${/}${EMPTY}even_more_resources.robot
-Variable          ../resources/varz.py
-Variable          ../resources/dynamic_varz.py    ${ARG}
-Variable          en/full_en.yaml    # This is a comment
-Variable          en/full_en.json    # This is a comment
-Variable          en/full_en.py    # This is a comment
-Variable          ${RES_PATH}/more_varz.py
-Biblioteca        ${technology lib}    # defined in varz.py | |
-Biblioteca        ${operating system}    # defined in another_resource.robot | |
+Variable         ../resources/varz.py
+Variable         ../resources/dynamic_varz.py    ${ARG}
+Variable         en/full_en.yaml    # This is a comment
+Variable         en/full_en.json    # This is a comment
+Variable         en/full_en.py    # This is a comment
+Variable         ${RES_PATH}/more_varz.py
+Biblioteca           ${technology lib}    # defined in varz.py | |
+Biblioteca           ${operating system}    # defined in another_resource.robot | |
 
 *** Variables ***
 ${SCALAR}         value
diff --git a/utest/resources/robotdata/language/lang_it.robot b/utest/resources/robotdata/language/lang_it.robot
index 72f35115f..0b49c3798 100644
--- a/utest/resources/robotdata/language/lang_it.robot
+++ b/utest/resources/robotdata/language/lang_it.robot
@@ -7,40 +7,41 @@ Language: Italian
 Documentazione     This test data file is used in *RobotIDE* _integration_ tests.
 ...               1-This is another line of the documentation
 ...               2-A continued line of documentation
-Suite Setup       Run Keywords    Log To Console    Suite Setup
+Configurazione Suite       Run Keywords    Log To Console    Suite Setup
 ...               AND    Log    Test
 ...               AND    Log to Console    Test
 ...               AND    My Suite Setup
-Suite Teardown    My Suite Teardown    ${scalar}    @{LIST}
-Test Setup        My Test Setup
-Test Teardown     My Overriding Test Teardown
+Distruzione Suite    My Suite Teardown    ${scalar}    @{LIST}
+Configurazione Test        My Test Setup
+Distruzione Test     My Overriding Test Teardown
 Tag Del Test         new_tag    ride    regeression    # Comment on Tags
 Metadati          My Meta    data
-Library           seleniumlibrary    # Purposefully wrong case | |
-Library           Process    # This is a comment
-Resource          en/full_en.resource
-Library           LibSpecLibrary
-Library           ${LIB NAME}
-Library           ArgLib    ${ARG}
-Resource          ../resources/resource.resource
-Resource          ../resources/resource2.robot
-Resource          PathResource.robot
-Resource          ../resources/resource.robot
-Resource          ${RES_PATH}/another_resource.robot
-Resource          ${RES_PATH}/more_resources/${RES NAME}
-Resource          ${RES_PATH}/more_resources${/}${EMPTY}even_more_resources.robot
-Variables         ../resources/varz.py
-Variables         ../resources/dynamic_varz.py    ${ARG}
-Variables         en/full_en.yaml    # This is a comment
-Variables         en/full_en.json    # This is a comment
-Variables         en/full_en.py    # This is a comment
-Variables         ${RES_PATH}/more_varz.py
-Library           ${technology lib}    # defined in varz.py | |
-Library           ${operating system}    # defined in another_resource.robot | |
+Libreria           seleniumlibrary    # Purposefully wrong case | |
+Libreria           Process    # This is a comment
+Risorsa          en/full_en.resource
+Libreria           LibSpecLibrary
+Libreria           ${LIB NAME}
+Libreria           ArgLib    ${ARG}
+Risorsa          ../resources/resource.resource
+Risorsa          ../resources/resource2.robot
+Risorsa          PathResource.robot
+Risorsa          ../resources/resource.robot
+Risorsa          ${RES_PATH}/another_resource.robot
+Risorsa          ${RES_PATH}/more_resources/${RES NAME}
+Risorsa          ${RES_PATH}/more_resources${/}${EMPTY}even_more_resources.robot
+Variabile         ../resources/varz.py
+Variabile         ../resources/dynamic_varz.py    ${ARG}
+Variabile         en/full_en.yaml    # This is a comment
+Variabile         en/full_en.json    # This is a comment
+Variabile         en/full_en.py    # This is a comment
+Variabile         ${RES_PATH}/more_varz.py
+Libreria           ${technology lib}    # defined in varz.py | |
+Libreria           ${operating system}    # defined in another_resource.robot | |
 
 *** Variabili ***
 ${SCALAR}         value
-@{LIST}           1    2    3    4    a    b    c    d
+@{LIST}           1    2    3    4    a    b    c
+...               d
 ${LIB NAME}       Collections
 ${RES_PATH}       ../resources
 ${ARG}            value
@@ -52,7 +53,7 @@ Second line of comments
 *** Casi Di Test ***
 My Test
     [Documentazione]    This is _test_ *case* documentation
-    [Tags]    test 1
+    [Tag]    test 1
     [Configurazione]    My Overriding Test Setup
     Log    Nothing to see
     [Distruzione]    My Overriding Test Teardown
@@ -60,7 +61,7 @@ My Test
 first test
     [Documentazione]    3-This is the documentation
     ...    4-A continued line of documentation
-    [Tags]    first    second
+    [Tag]    first    second
     [Configurazione]    Log To Console    Test Setup
     [Timeout]    60
     First Keyword    nonsense
@@ -71,7 +72,7 @@ first test
     [Distruzione]    Log To Console    Test Teardown
 
 second test
-    [Tags]    first    second    # This is a comment
+    [Tag]    first    second    # This is a comment
     [Configurazione]    Log To Console    Test Setup    # This is a comment
     [Template]    First Keyword    # This is a comment
     [Timeout]    60    # This is a comment
@@ -107,7 +108,7 @@ First Keyword
     [Documentazione]    5-This is the documentation
     ...
     ...    7-A continued line of documentation
-    [Tags]    first    second    # This is a comment
+    [Tag]    first    second    # This is a comment
     Log To Console    This is the first keyword
 
 ${user} is registered
diff --git a/utest/resources/robotdata/language/lang_pt.robot b/utest/resources/robotdata/language/lang_pt.robot
index 7b7fa4ada..84652dd02 100644
--- a/utest/resources/robotdata/language/lang_pt.robot
+++ b/utest/resources/robotdata/language/lang_pt.robot
@@ -4,39 +4,39 @@ Language: Portuguese
 # A blank line
 
 *** Definições ***
-Documentação      This test data file is used in *RobotIDE* _integration_ tests.
+Documentação     This test data file is used in *RobotIDE* _integration_ tests.
 ...               1-This is another line of the documentation
 ...               2-A continued line of documentation
-Inicialização de Suíte    Run Keywords    Log To Console    Suite Setup
+Inicialização de Suíte       Run Keywords    Log To Console    Suite Setup
 ...               AND    Log    Test
 ...               AND    Log to Console    Test
 ...               AND    My Suite Setup
 Finalização de Suíte    My Suite Teardown    ${scalar}    @{LIST}
-Inicialização de Teste    My Test Setup
-Finalização de Teste    My Overriding Test Teardown
-Etiquetas de Testes    new_tag    ride    regeression    # Comment on Tags
-Metadados         My Meta    data
-Biblioteca        seleniumlibrary    # Purposefully wrong case | |
-Biblioteca        Process    # This is a comment
-Recurso           en/full_en.resource
-Biblioteca        LibSpecLibrary
-Biblioteca        ${LIB NAME}
-Biblioteca        ArgLib    ${ARG}
-Recurso           ../resources/resource.resource
-Recurso           ../resources/resource2.robot
-Recurso           PathResource.robot
-Recurso           ../resources/resource.robot
-Recurso           ${RES_PATH}/another_resource.robot
-Recurso           ${RES_PATH}/more_resources/${RES NAME}
-Recurso           ${RES_PATH}/more_resources${/}${EMPTY}even_more_resources.robot
-Variável          ../resources/varz.py
-Variável          ../resources/dynamic_varz.py    ${ARG}
-Variável          en/full_en.yaml    # This is a comment
-Variável          en/full_en.json    # This is a comment
-Variável          en/full_en.py    # This is a comment
-Variável          ${RES_PATH}/more_varz.py
-Biblioteca        ${technology lib}    # defined in varz.py | |
-Biblioteca        ${operating system}    # defined in another_resource.robot | |
+Inicialização de Teste        My Test Setup
+Finalização de Teste     My Overriding Test Teardown
+Etiquetas de Testes         new_tag    ride    regeression    # Comment on Tags
+Metadados          My Meta    data
+Biblioteca           seleniumlibrary    # Purposefully wrong case | |
+Biblioteca           Process    # This is a comment
+Recurso          en/full_en.resource
+Biblioteca           LibSpecLibrary
+Biblioteca           ${LIB NAME}
+Biblioteca           ArgLib    ${ARG}
+Recurso          ../resources/resource.resource
+Recurso          ../resources/resource2.robot
+Recurso          PathResource.robot
+Recurso          ../resources/resource.robot
+Recurso          ${RES_PATH}/another_resource.robot
+Recurso          ${RES_PATH}/more_resources/${RES NAME}
+Recurso          ${RES_PATH}/more_resources${/}${EMPTY}even_more_resources.robot
+Variável         ../resources/varz.py
+Variável         ../resources/dynamic_varz.py    ${ARG}
+Variável         en/full_en.yaml    # This is a comment
+Variável         en/full_en.json    # This is a comment
+Variável         en/full_en.py    # This is a comment
+Variável         ${RES_PATH}/more_varz.py
+Biblioteca           ${technology lib}    # defined in varz.py | |
+Biblioteca           ${operating system}    # defined in another_resource.robot | |
 
 *** Variáveis ***
 ${SCALAR}         value