Revert "spns #37541: ensure APP_NAME is ALAMOS_PROFILE is not overloaded by APP_NAME...

This reverts commit 128b22dfdb6ededbd4abada2ebb5be48f044cff5.

diff --git a/products/GUI.pyconf b/products/GUI.pyconf
index 78d3683be7fc902b9ab0134d32eac8a29a89347a..b59608c3c957ae658c12ce9c5f99061f89caf35a 100644 (file)
--- a/products/GUI.pyconf
+++ b/products/GUI.pyconf
@@ -76,11 +76,6 @@ default_win :
 
 }
 
-version_ALAMOS_V9_12_0:
-{
-  patches : ['SPNS-37541-LightApp-APP_NAME.GUI-V9_12_0.patch']
-}
-
 version_V9_10_0:
 {
   patches: []

diff --git a/products/patches/SPNS-37541-LightApp-APP_NAME.GUI-V9_12_0.patch b/products/patches/SPNS-37541-LightApp-APP_NAME.GUI-V9_12_0.patch
deleted file mode 100644 (file)
index 3767c10..0000000
--- a/products/patches/SPNS-37541-LightApp-APP_NAME.GUI-V9_12_0.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/src/LightApp/resources/LightApp_msg_en.ts b/src/LightApp/resources/LightApp_msg_en.ts
-index bb72f990a..ab8bc2223 100644
---- a/src/LightApp/resources/LightApp_msg_en.ts
-+++ b/src/LightApp/resources/LightApp_msg_en.ts
-@@ -9,14 +9,11 @@
-     </message>
-     <message>
-         <source>ABOUT_COPYRIGHT</source>
--        <translation>Copyright (C) 2007-2023 CEA, EDF, OPEN CASCADE
--
--Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6,
--CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</translation>
-+        <translation>Copyright (C) 2007-2024 CEA</translation>
-     </message>
-     <message>
-         <source>ABOUT_CAPTION</source>
--        <translation>About %1</translation>
-+        <translation>About ALAMOS</translation>
-     </message>
-     <message>
-         <source>ABOUT_BASE</source>
-@@ -38,10 +35,6 @@ CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</translatio
-         <source>ABOUT_CLOSE</source>
-         <translation>&amp;Close</translation>
-     </message>
--    <message>
--        <source>APP_NAME</source>
--        <translation>SALOME</translation>
--    </message>
-     <message>
-         <source>ABOUT_LICENSE</source>
-         <translation>GNU LGPL</translation>
-diff --git a/src/LightApp/resources/LightApp_msg_fr.ts b/src/LightApp/resources/LightApp_msg_fr.ts
-index 00b1bf008..72f846834 100644
---- a/src/LightApp/resources/LightApp_msg_fr.ts
-+++ b/src/LightApp/resources/LightApp_msg_fr.ts
-@@ -9,10 +9,7 @@
-     </message>
-     <message>
-         <source>ABOUT_COPYRIGHT</source>
--        <translation>Copyright (C) 2007-2023 CEA, EDF, OPEN CASCADE
--
--Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6,
--CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</translation>
-+        <translation>Copyright (C) 2007-2024 CEA</translation>
-     </message>
-     <message>
-         <source>ABOUT_CAPTION</source>
-@@ -38,10 +35,6 @@ CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</translatio
-         <source>ABOUT_CLOSE</source>
-         <translation>&amp;Fermer</translation>
-     </message>
--    <message>
--        <source>APP_NAME</source>
--        <translation>SALOME</translation>
--    </message>
-     <message>
-         <source>ABOUT_LICENSE</source>
-         <translation>GNU LGPL</translation>
-diff --git a/src/LightApp/resources/LightApp_msg_ja.ts b/src/LightApp/resources/LightApp_msg_ja.ts
-index 99841e9d7..77421ee15 100644
---- a/src/LightApp/resources/LightApp_msg_ja.ts
-+++ b/src/LightApp/resources/LightApp_msg_ja.ts
-@@ -9,10 +9,7 @@
-     </message>
-     <message>
-       <source>ABOUT_COPYRIGHT</source>
--      <translation>Copyright (C) 2007-2023 CEA, EDF, OPEN CASCADE
--
--Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6,
--CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</translation>
-+      <translation>Copyright (C) 2007-2024 CEA</translation>
-     </message>
-     <message>
-       <source>ABOUT_CAPTION</source>
-@@ -38,10 +35,6 @@ CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</translatio
-       <source>ABOUT_CLOSE</source>
-       <translation>閉じる(&amp;C)</translation>
-     </message>
--    <message>
--      <source>APP_NAME</source>
--      <translation>SALOME</translation>
--    </message>
-     <message>
-       <source>ABOUT_LICENSE</source>
-       <translation>GNU LGPL</translation>