From f1a2cd2f0f146224bac356436f245e6067c7ce16 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 8 Nov 2024 15:45:22 +0100 Subject: [PATCH] Revert "spns #37541: ensure APP_NAME is ALAMOS_PROFILE is not overloaded by APP_NAME in GUI" This reverts commit 128b22dfdb6ededbd4abada2ebb5be48f044cff5. --- products/GUI.pyconf | 5 -- ...-37541-LightApp-APP_NAME.GUI-V9_12_0.patch | 86 ------------------- 2 files changed, 91 deletions(-) delete mode 100644 products/patches/SPNS-37541-LightApp-APP_NAME.GUI-V9_12_0.patch diff --git a/products/GUI.pyconf b/products/GUI.pyconf index 78d3683..b59608c 100644 --- 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 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 @@ - - - ABOUT_COPYRIGHT -- Copyright (C) 2007-2023 CEA, EDF, OPEN CASCADE -- --Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, --CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -+ Copyright (C) 2007-2024 CEA - - - ABOUT_CAPTION -- About %1 -+ About ALAMOS - - - ABOUT_BASE -@@ -38,10 +35,6 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITASABOUT_CLOSE - &Close - -- -- APP_NAME -- SALOME -- - - ABOUT_LICENSE - GNU LGPL -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 @@ - - - ABOUT_COPYRIGHT -- Copyright (C) 2007-2023 CEA, EDF, OPEN CASCADE -- --Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, --CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -+ Copyright (C) 2007-2024 CEA - - - ABOUT_CAPTION -@@ -38,10 +35,6 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITASABOUT_CLOSE - &Fermer - -- -- APP_NAME -- SALOME -- - - ABOUT_LICENSE - GNU LGPL -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 @@ - - - ABOUT_COPYRIGHT -- Copyright (C) 2007-2023 CEA, EDF, OPEN CASCADE -- --Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, --CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -+ Copyright (C) 2007-2024 CEA - - - ABOUT_CAPTION -@@ -38,10 +35,6 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITASABOUT_CLOSE - 閉じる(&C) - -- -- APP_NAME -- SALOME -- - - ABOUT_LICENSE - GNU LGPL -- 2.39.2