Commit c9772728 authored by ics's avatar ics

Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	lib64/nomadgui-gtk.linux.x86_64.jar
parents 08ec7366 2e641eff
......@@ -217,7 +217,14 @@ simulationTabCannotBeClosedWhileSomethingRunningOrPaused=You cannot close the si
simulationTabCannotBeClosedWhileSomethingRunningOrPausedTitle=Invalid action
incoherentContentBetweenClientAndServerCommandZonesMessage=Client and server command zone contents are no longer coherent.\nThe client is going to restart.
incorrectValueEnteredMessage=Incorrect value entered!
incorrectFromValueEnteredMessage=Incorrect from value!
incorrectRoValueEnteredMessage=Incorrect to value!
incorrectStepValueEnteredMessage=Incorrect step value!
incorrectNbPointsValueEnteredMessage=Incorrect number of points value!
mustEnterFromValue=You must enter a from value!
mustEnterToValue=You must enter a to value!
mustEnterStepValue=You must enter a step value!
mustEnterNbPointsValue=You must enter a number of points value!
propertyWrongValueEnteredMessage1=Problem while setting property
propertyWrongValueEnteredMessage2=to value
settingsPluginApplyConfigButtonToolTip=Apply settings configuration
......@@ -361,8 +368,8 @@ remoteControlIsDisabled=Remote control is disabled!
remoteClientMustLoginMessage=As a remote client, you must log in to run Nomad
mustLogInToViewLogsMessage=You must log in to view logs!
viewLogsTitle=View Logs
mustLogInToViewSurveyMessage=You must log in to view parameter survey!
viewSurveyTitle=View Parameter Survey
mustLogInToViewSurveyMessage=You must log in to view Nomad charts!
viewSurveyTitle=View Nomad Charts
cannotAdminIfRACEnabledMessage=Administrator mode is not available while remote access control is authorized!
logAsAdminMessage=Log as administrator
......@@ -372,4 +379,5 @@ widgetIsDisableForRemoteClientMessage=File Chooser is not available on remote cl
usersControllerMissingMessage=Functionnality not yet configured on this instrument.\nContact SCI
commandBoxGoToSettingsTooltip=Go to settings plugin for
attachFileMessage=Attach a file
\ No newline at end of file
attachFileMessage=Attach a file
alreadyAtTopDirectoryMessage=You are already at root directory!
\ No newline at end of file
......@@ -75,6 +75,7 @@ magfin,4,command
inibpb,4,command
cacq,4,command
cscan,5,command
flqscan,5,command
for,3,keyword
endfor,6,keyword
break,5,keyword
......
......@@ -568,4 +568,7 @@ filesGeneratedMessage=files generated:
saveFileLabel=Save file
selectFileLabel=Double click on a file to select it
fileChooserToolTip=Open file selector
\ No newline at end of file
fileChooserToolTip=Open file selector
nbBoxesLabel=Current number of command boxes
upDirectoryMessage=Up directory
\ No newline at end of file
No preview for this file type
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment