From fc6558c22b517dd8b29d5cabc50c63f343b1a305 Mon Sep 17 00:00:00 2001 From: Georgiy Komarov Date: Wed, 9 Jun 2021 12:20:51 +0300 Subject: [PATCH] gui: Set the correct names for coding standards in UI elements. NFC. (#3294) Names of MISRA and CERT should be written is uppercase, because they are abbrevations. --- gui/cppcheck_de.ts | 14 +++++++------- gui/cppcheck_es.ts | 10 +++++----- gui/cppcheck_fi.ts | 10 +++++----- gui/cppcheck_fr.ts | 10 +++++----- gui/cppcheck_it.ts | 10 +++++----- gui/cppcheck_ja.ts | 18 +++++++++--------- gui/cppcheck_ko.ts | 10 +++++----- gui/cppcheck_nl.ts | 10 +++++----- gui/cppcheck_ru.ts | 12 ++++++------ gui/cppcheck_sr.ts | 10 +++++----- gui/cppcheck_sv.ts | 12 ++++++------ gui/cppcheck_zh_CN.ts | 10 +++++----- gui/help/preferences.html | 6 +++--- gui/help/projectfiledialog.html | 4 ++-- gui/projectfiledialog.cpp | 2 +- gui/projectfiledialog.ui | 4 ++-- gui/settings.ui | 4 ++-- 17 files changed, 78 insertions(+), 78 deletions(-) diff --git a/gui/cppcheck_de.ts b/gui/cppcheck_de.ts index c81c77db8..d43aa7faa 100644 --- a/gui/cppcheck_de.ts +++ b/gui/cppcheck_de.ts @@ -1415,8 +1415,8 @@ Options: - Misra rule texts - Misra-Regeltexte + MISRA rule texts + MISRA-Regeltexte @@ -1695,8 +1695,8 @@ Options: - Cert - Cert + CERT + CERT @@ -1793,7 +1793,7 @@ Options: - Misra rule texts file (%1) + MISRA rule texts file (%1) MISRA-Regeltext-Datei @@ -2451,12 +2451,12 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde - Misra addon + MISRA addon MISRA-Addon - Misra rule texts file + MISRA rule texts file MISRA-Regeltext-Datei diff --git a/gui/cppcheck_es.ts b/gui/cppcheck_es.ts index c2894980f..786438250 100644 --- a/gui/cppcheck_es.ts +++ b/gui/cppcheck_es.ts @@ -1565,7 +1565,7 @@ Options: - Misra rule texts + MISRA rule texts @@ -1821,7 +1821,7 @@ Options: - Cert + CERT @@ -1923,7 +1923,7 @@ Options: - Misra rule texts file (%1) + MISRA rule texts file (%1) @@ -2599,12 +2599,12 @@ Para cambiar el tipo de comportamiento, abra el menú Ver. - Misra addon + MISRA addon - Misra rule texts file + MISRA rule texts file diff --git a/gui/cppcheck_fi.ts b/gui/cppcheck_fi.ts index 701151619..f902a869e 100644 --- a/gui/cppcheck_fi.ts +++ b/gui/cppcheck_fi.ts @@ -1407,7 +1407,7 @@ Options: - Misra rule texts + MISRA rule texts @@ -1667,7 +1667,7 @@ Options: - Cert + CERT @@ -1765,7 +1765,7 @@ Options: - Misra rule texts file (%1) + MISRA rule texts file (%1) @@ -2432,12 +2432,12 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik - Misra addon + MISRA addon - Misra rule texts file + MISRA rule texts file diff --git a/gui/cppcheck_fr.ts b/gui/cppcheck_fr.ts index 9c2472ad1..b2d3501f3 100644 --- a/gui/cppcheck_fr.ts +++ b/gui/cppcheck_fr.ts @@ -1604,7 +1604,7 @@ Do you want to proceed? - Cert + CERT @@ -1705,7 +1705,7 @@ Do you want to proceed? - Misra rule texts + MISRA rule texts @@ -1815,7 +1815,7 @@ Do you want to proceed? - Misra rule texts file (%1) + MISRA rule texts file (%1) @@ -2589,12 +2589,12 @@ Pour configurer les erreurs affichées, ouvrez le menu d'affichage. - Misra addon + MISRA addon - Misra rule texts file + MISRA rule texts file diff --git a/gui/cppcheck_it.ts b/gui/cppcheck_it.ts index 177c21acd..0ca9d4c13 100644 --- a/gui/cppcheck_it.ts +++ b/gui/cppcheck_it.ts @@ -1582,7 +1582,7 @@ Options: - Misra rule texts + MISRA rule texts @@ -1834,7 +1834,7 @@ Options: - Cert + CERT @@ -1932,7 +1932,7 @@ Options: - Misra rule texts file (%1) + MISRA rule texts file (%1) @@ -2631,12 +2631,12 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza. - Misra addon + MISRA addon - Misra rule texts file + MISRA rule texts file diff --git a/gui/cppcheck_ja.ts b/gui/cppcheck_ja.ts index d21d287f8..b3f7bcf65 100644 --- a/gui/cppcheck_ja.ts +++ b/gui/cppcheck_ja.ts @@ -1619,8 +1619,8 @@ Options: - Misra rule texts - Misra ルールテキスト + MISRA rule texts + MISRA ルールテキスト @@ -1927,7 +1927,7 @@ Options: - Cert + CERT CERT @@ -2045,8 +2045,8 @@ Options: - Misra rule texts file (%1) - Misraルールテキストファイル (%1) + MISRA rule texts file (%1) + MISRAルールテキストファイル (%1) @@ -2749,13 +2749,13 @@ To toggle what kind of errors are shown, open view menu. - Misra addon - Misraアドオン + MISRA addon + MISRAアドオン - Misra rule texts file - Misra ルールテキストファイル + MISRA rule texts file + MISRA ルールテキストファイル diff --git a/gui/cppcheck_ko.ts b/gui/cppcheck_ko.ts index 46804e34a..84b8de54e 100644 --- a/gui/cppcheck_ko.ts +++ b/gui/cppcheck_ko.ts @@ -1687,7 +1687,7 @@ Do you want to proceed? - Cert + CERT @@ -1788,7 +1788,7 @@ Do you want to proceed? - Misra rule texts + MISRA rule texts @@ -1898,7 +1898,7 @@ Do you want to proceed? - Misra rule texts file (%1) + MISRA rule texts file (%1) @@ -2688,12 +2688,12 @@ To toggle what kind of errors are shown, open view menu. - Misra addon + MISRA addon - Misra rule texts file + MISRA rule texts file diff --git a/gui/cppcheck_nl.ts b/gui/cppcheck_nl.ts index a660d1a85..a8901c74c 100644 --- a/gui/cppcheck_nl.ts +++ b/gui/cppcheck_nl.ts @@ -1564,7 +1564,7 @@ Options: - Misra rule texts + MISRA rule texts @@ -1816,7 +1816,7 @@ Options: - Cert + CERT @@ -1914,7 +1914,7 @@ Options: - Misra rule texts file (%1) + MISRA rule texts file (%1) @@ -2615,12 +2615,12 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden. - Misra addon + MISRA addon - Misra rule texts file + MISRA rule texts file diff --git a/gui/cppcheck_ru.ts b/gui/cppcheck_ru.ts index cdf7088e1..320a68471 100644 --- a/gui/cppcheck_ru.ts +++ b/gui/cppcheck_ru.ts @@ -1697,7 +1697,7 @@ Options: - Misra rule texts + MISRA rule texts Файл с текстами правил MISRA @@ -1934,8 +1934,8 @@ Options: - Cert - Cert + CERT + CERT @@ -2032,7 +2032,7 @@ Options: - Misra rule texts file (%1) + MISRA rule texts file (%1) Файл текстов правил MISRA (%1) @@ -2732,12 +2732,12 @@ To toggle what kind of errors are shown, open view menu. - Misra addon + MISRA addon Дополнение MISRA - Misra rule texts file + MISRA rule texts file Файл с текстами правил MISRA: diff --git a/gui/cppcheck_sr.ts b/gui/cppcheck_sr.ts index b026fdfde..87cd72ce5 100644 --- a/gui/cppcheck_sr.ts +++ b/gui/cppcheck_sr.ts @@ -1432,7 +1432,7 @@ Options: - Misra rule texts + MISRA rule texts @@ -1692,7 +1692,7 @@ Options: - Cert + CERT @@ -1790,7 +1790,7 @@ Options: - Misra rule texts file (%1) + MISRA rule texts file (%1) @@ -2453,12 +2453,12 @@ To toggle what kind of errors are shown, open view menu. - Misra addon + MISRA addon - Misra rule texts file + MISRA rule texts file diff --git a/gui/cppcheck_sv.ts b/gui/cppcheck_sv.ts index 1d0358d53..706a8c7f4 100644 --- a/gui/cppcheck_sv.ts +++ b/gui/cppcheck_sv.ts @@ -1817,7 +1817,7 @@ Sökvägar och defines importeras. - Misra rule texts + MISRA rule texts @@ -1970,8 +1970,8 @@ Sökvägar och defines importeras. - Cert - Cert + CERT + CERT Extra Tools @@ -2050,7 +2050,7 @@ Sökvägar och defines importeras. - Misra rule texts file (%1) + MISRA rule texts file (%1) @@ -2795,12 +2795,12 @@ För att ställa in vilka fel som skall visas använd visa menyn. - Misra addon + MISRA addon - Misra rule texts file + MISRA rule texts file diff --git a/gui/cppcheck_zh_CN.ts b/gui/cppcheck_zh_CN.ts index 02ae01b9f..868dc292a 100644 --- a/gui/cppcheck_zh_CN.ts +++ b/gui/cppcheck_zh_CN.ts @@ -1581,7 +1581,7 @@ Options: - Misra rule texts + MISRA rule texts @@ -1833,7 +1833,7 @@ Options: - Cert + CERT @@ -1931,7 +1931,7 @@ Options: - Misra rule texts file (%1) + MISRA rule texts file (%1) @@ -2632,12 +2632,12 @@ To toggle what kind of errors are shown, open view menu. - Misra addon + MISRA addon - Misra rule texts file + MISRA rule texts file diff --git a/gui/help/preferences.html b/gui/help/preferences.html index 31cce6593..d35dfdcc9 100644 --- a/gui/help/preferences.html +++ b/gui/help/preferences.html @@ -49,9 +49,9 @@ warnings on the screen will not have the full path.

where python is. Unless you configure something, Cppcheck will try to execute python in your PATH.

-

Misra rule texts
Only needed if you want to use the Misra addon. -Cppcheck is not legally allowed to distribute the Misra rule texts and these -must be provided by users. The Misra rule texts are proprietary. An example +

MISRA rule texts
Only needed if you want to use the MISRA addon. +Cppcheck is not legally allowed to distribute the MISRA rule texts and these +must be provided by users. The MISRA rule texts are proprietary. An example rule text file: 

Appendix A Summary of guidelines
 Rule 1.1
diff --git a/gui/help/projectfiledialog.html b/gui/help/projectfiledialog.html
index 5e4ef7bc5..8e544d29a 100644
--- a/gui/help/projectfiledialog.html
+++ b/gui/help/projectfiledialog.html
@@ -167,9 +167,9 @@ overflow in year 2038. Check that the code does not use such timers.

 
 
Thread safety
Check that the code is thread safe

 
-
Cert
Ensure that the Cert coding standard is followed

+
CERT
Ensure that the CERT coding standard is followed

 
-
Misra
Ensure that the Misra coding standard is followed. Please
+
MISRA
Ensure that the MISRA coding standard is followed. Please
 note you need to have a textfile with the misra rule texts to get proper
 warning messages. Cppcheck is not legally allowed to distribute the misra
 rule texts.

diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
index 6c5e138ac..944361ca4 100644
--- a/gui/projectfiledialog.cpp
+++ b/gui/projectfiledialog.cpp
@@ -822,7 +822,7 @@ void ProjectFileDialog::browseMisraFile()
     const QString fileName = QFileDialog::getOpenFileName(this,
                              tr("Select MISRA rule texts file"),
                              QDir::homePath(),
-                             tr("Misra rule texts file (%1)").arg("*.txt"));
+                             tr("MISRA rule texts file (%1)").arg("*.txt"));
     if (!fileName.isEmpty()) {
         QSettings settings;
         mUI.mEditMisraFile->setText(fileName);
diff --git a/gui/projectfiledialog.ui b/gui/projectfiledialog.ui
index e8db9338e..2793cae16 100644
--- a/gui/projectfiledialog.ui
+++ b/gui/projectfiledialog.ui
@@ -800,7 +800,7 @@
           
            
             
-             Cert
+             CERT
             
            
           
@@ -816,7 +816,7 @@
             
              
               
-               Misra rule texts
+               MISRA rule texts
               
              
             
diff --git a/gui/settings.ui b/gui/settings.ui
index 924d15b54..4cd2c93fc 100644
--- a/gui/settings.ui
+++ b/gui/settings.ui
@@ -320,7 +320,7 @@
        
         
          
-          Misra addon
+          MISRA addon
          
          
           
@@ -328,7 +328,7 @@
             
              
               
-               Misra rule texts file
+               MISRA rule texts file