diff --git a/.project b/.project
index f88ceb4088c1a250caab8515c87826b2a28409fd..c4f76a2d1c51668e9346e329220f89ee383e5374 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>nomad-gui-release</name>
+	<name>nomadgui-release</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/conf/client/clientMessages.properties b/conf/client/clientMessages.properties
index a231bf22b3ba1fa76b4b988085f023e875095c2c..87b3322513a98c95603cd44bda37fb3928b320ff 100644
--- a/conf/client/clientMessages.properties
+++ b/conf/client/clientMessages.properties
@@ -209,6 +209,11 @@ commandLineNoGrammarDefinedForThisInstrument=Command line unavailable. No gramma
 commandLinePauseMessage=Execution is paused. Type ENTER to continue or x to stop or n to stop at end
 commandLineNotSynchronised=Switch to box view forbidden while a command is running!
 
+
+forbiddenChangeOfProposalWhileSomethingRunning=You cannot change proposal while commands are running in the server.
+forbiddenChangeOfProposalWhileSomethingPaused=You cannot change proposal while commands are paused in the server.
+changeOfProposalTitle=Change proposal
+
 simulationTabCannotBeClosedWhileSomethingRunningOrPaused=You cannot close the simulation tab while something is running or paused.
 simulationTabCannotBeClosedWhileSomethingRunningOrPausedTitle=Invalid action
 
diff --git a/conf/client/globalLabels.properties b/conf/client/globalLabels.properties
index aa1e2b039192eef1ad081f10625cec0cd0023705..6e62490fc6d4578602fd85d05662cd06bbe78fe7 100644
--- a/conf/client/globalLabels.properties
+++ b/conf/client/globalLabels.properties
@@ -2,7 +2,7 @@ commandLineLabel=Command :
 loginLabel=LOGIN
 passwordLabel=PASSWORD
 loadingLabel=LOADING
-selectProposalLabel=Select proposal
+loginButtonLabel=Login
 exitButtonLabel=Exit
 
 loginLabelKey=User
@@ -563,4 +563,5 @@ generateCommandFileLabel=Generate command file
 generateControllerFilesLabel=Generate controller files
 mustSelectControllerOrDriverMessage=You must select a controller or a driver.
 mustSelectDirectoryMessage=You must select a directory to save generated files.
-filesGeneratedMessage=files generated:
\ No newline at end of file
+filesGeneratedMessage=files generated:
+saveFileLabel=Save file
\ No newline at end of file
diff --git a/lib64/nomadgui-gtk.linux.x86.jar b/lib64/nomadgui-gtk.linux.x86.jar
index 96d7f879531a21c72f114ca68011db092a8396f1..1b1861ffe5c1b0a4342a2333b4ca13664faed8e2 100644
Binary files a/lib64/nomadgui-gtk.linux.x86.jar and b/lib64/nomadgui-gtk.linux.x86.jar differ
diff --git a/lib64/nomadgui-gtk.linux.x86_64.jar b/lib64/nomadgui-gtk.linux.x86_64.jar
index 37b63fcca40a90d5a1940e4d8fe78923bfde65fb..650b32f1a08af8b61e363421181b5c835d9aa703 100644
Binary files a/lib64/nomadgui-gtk.linux.x86_64.jar and b/lib64/nomadgui-gtk.linux.x86_64.jar differ