From 987d29241484e9647348d01ed1c1f23f91ea4a33 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 18 Jun 2024 15:36:19 +0200
Subject: [PATCH] Disambiguate "Executable:"

"the executable" versus "the file is executable"

Fix translations where both variants were available (i.e. that used the
adjective for the translation in Core, but the noun elsewhere).

Fixes: QTCREATORBUG-31059
Change-Id: Id140612f201cea1feca007557bbedf030cfdf504
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
---
 share/qtcreator/translations/qtcreator_de.ts              | 6 ++++++
 share/qtcreator/translations/qtcreator_hr.ts              | 6 ++++++
 share/qtcreator/translations/qtcreator_ru.ts              | 6 ++++++
 src/plugins/coreplugin/dialogs/externaltoolconfig.cpp     | 2 +-
 src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp   | 2 +-
 src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp | 2 +-
 6 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 3dc80d58d94..cc2c1327d9e 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -21936,8 +21936,14 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
     </message>
     <message>
         <source>Executable:</source>
+        <comment>adjective</comment>
         <translation>Ausführbar:</translation>
     </message>
+    <message>
+        <source>Executable:</source>
+        <comment>noun</comment>
+        <translation>Ausführbare Datei:</translation>
+    </message>
     <message>
         <source>Symbolic link:</source>
         <translation>Symbolischer Link:</translation>
diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts
index acd2770cab3..93848c19411 100644
--- a/share/qtcreator/translations/qtcreator_hr.ts
+++ b/share/qtcreator/translations/qtcreator_hr.ts
@@ -2133,8 +2133,14 @@ Međutim, korištenje opuštenih i proširenih pravila također znači da nije m
     </message>
     <message>
         <source>Executable:</source>
+        <comment>adjective</comment>
         <translation>Izvršavajuća:</translation>
     </message>
+    <message>
+        <source>Executable:</source>
+        <comment>noun</comment>
+        <translation>Izvršna datoteka:</translation>
+    </message>
     <message>
         <source>Symbolic link:</source>
         <translation>Simbolička poveznica:</translation>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 7f57fe4f12d..44f5dfa5823 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -18313,8 +18313,14 @@ will also disable the following plugins:
     </message>
     <message>
         <source>Executable:</source>
+        <comment>adjective</comment>
         <translation>Можно запускать:</translation>
     </message>
+    <message>
+        <source>Executable:</source>
+        <comment>noun</comment>
+        <translation>Программа:</translation>
+    </message>
     <message>
         <source>Symbolic link:</source>
         <translation>Символьная ссылка:</translation>
diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
index a758adf1053..2141ef61c2e 100644
--- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
+++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
@@ -563,7 +563,7 @@ ExternalToolConfig::ExternalToolConfig()
 
     Form {
         Tr::tr("Description:"), m_description, br,
-        Tr::tr("Executable:"), m_executable, br,
+        Tr::tr("Executable:", "noun"), m_executable, br,
         Tr::tr("Arguments:"), m_arguments, br,
         Tr::tr("Working directory:"), m_workingDirectory, br,
         outputLabel, m_outputBehavior, br,
diff --git a/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp b/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp
index de3362a408f..2a480ff17b5 100644
--- a/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp
@@ -79,7 +79,7 @@ FilePropertiesDialog::FilePropertiesDialog(const FilePath &filePath, QWidget *pa
             Tr::tr("Last modified:"), m_lastModified, br,
             Tr::tr("Readable:"), m_readable, br,
             Tr::tr("Writable:"), m_writable, br,
-            Tr::tr("Executable:"), m_executable, br,
+            Tr::tr("Executable:", "adjective"), m_executable, br,
             Tr::tr("Symbolic link:"), m_symLink, br
         },
         buttonBox
diff --git a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp
index 259ffb6aa4a..bcc685c9532 100644
--- a/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp
+++ b/src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp
@@ -220,7 +220,7 @@ bool SpotlightLocatorFilter::openConfigDialog(QWidget *parent, bool &needsRefres
     caseSensitiveArgumentsEdit->setText(m_caseSensitiveArguments);
     auto sortResults = new QCheckBox(Tr::tr("Sort results"));
     sortResults->setChecked(m_sortResults);
-    layout->addRow(Tr::tr("Executable:"), commandEdit);
+    layout->addRow(Tr::tr("Executable:", "noun"), commandEdit);
     layout->addRow(Tr::tr("Arguments:"), argumentsEdit);
     layout->addRow(Tr::tr("Case sensitive:"), caseSensitiveArgumentsEdit);
     layout->addRow({}, sortResults);