plcopeneditor_history: comparison PLCOpenEditor.py

equal deleted inserted replaced

-:afe2488a4635
+:22d16c457d87
 elif itemtype == ITEM_POU:
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug) if name != old_name]:
 message = _("\"%s\" pou already exists!")%new_name
 abort = True
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(debug = self.Debug)]:
-messageDialog = wx.MessageDialog(self, _("A pou has an element with \"%s\" as name. It can generate a conflict. Do you wish to continue?")%new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
+messageDialog = wx.MessageDialog(self, _("A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?")%new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
 if messageDialog.ShowModal() == wx.ID_NO:
 abort = True
 messageDialog.Destroy()
 if not abort:
 self.Controler.ChangePouName(old_name, new_name)
 self.RefreshLibraryTree()
 self.RefreshPageTitles()
 elif itemtype == ITEM_TRANSITION:
 pou_name = GetParentName(self.TypesTree, item, ITEM_POU)
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]:
-message = _("A pou with \"%s\" as name exists!")%new_name
+message = _("A POU named \"%s\" already exists!")%new_name
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(pou_name, self.Debug) if name != old_name]:
 message = _("A variable with \"%s\" as name already exists in this pou!")%new_name
 else:
 self.Controler.ChangePouTransitionName(pou_name, old_name, new_name)
 self.RefreshEditorNames(self.Controler.ComputePouTransitionName(pou_name, old_name),
 self.Controler.ComputePouTransitionName(pou_name, new_name))
 self.RefreshPageTitles()
 elif itemtype == ITEM_ACTION:
 pou_name = GetParentName(self.TypesTree, item, ITEM_POU)
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]:
-message = _("A pou with \"%s\" as name exists!")%new_name
+message = _("A POU named \"%s\" already exists!")%new_name
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(pou_name, self.Debug) if name != old_name]:
 message = _("A variable with \"%s\" as name already exists in this pou!")%new_name
 else:
 self.Controler.ChangePouActionName(pou_name, old_name, new_name)
 self.RefreshEditorNames(self.Controler.ComputePouActionName(pou_name, old_name),
 elif itemtype == ITEM_CONFIGURATION:
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectConfigNames(self.Debug) if name != old_name]:
 message = _("\"%s\" config already exists!")%new_name
 abort = True
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]:
-messageDialog = wx.MessageDialog(self, _("A pou is defined with \"%s\" as name. It can generate a conflict. Do you wish to continue?")%new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
+messageDialog = wx.MessageDialog(self, _("There is a POU named \"%s\". This could cause a conflict. Do you wish to continue?")%new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
 if messageDialog.ShowModal() == wx.ID_NO:
 abort = True
 messageDialog.Destroy()
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(debug = self.Debug)]:
-messageDialog = wx.MessageDialog(self, _("A pou has an element with \"%s\" as name. It can generate a conflict. Do you wish to continue?")%new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
+messageDialog = wx.MessageDialog(self, _("A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?")%new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
 if messageDialog.ShowModal() == wx.ID_NO:
 abort = True
 messageDialog.Destroy()
 if not abort:
 self.Controler.ChangeConfigurationName(old_name, new_name)
 config_name = GetParentName(self.TypesTree, item, ITEM_CONFIGURATION)
 if new_name.upper() in [name.upper() for name in self.Controler.GetProjectConfigNames(self.Debug)]:
 message = _("\"%s\" config already exists!")%new_name
 abort = True
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]:
-messageDialog = wx.MessageDialog(self, _("A pou is defined with \"%s\" as name. It can generate a conflict. Do you wish to continue?")%new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
+messageDialog = wx.MessageDialog(self, _("There is a POU named \"%s\". This could cause a conflict. Do you wish to continue?")%new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
 if messageDialog.ShowModal() == wx.ID_NO:
 abort = True
 messageDialog.Destroy()
 elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(debug = self.Debug)]:
-messageDialog = wx.MessageDialog(self, _("A pou has an element with \"%s\" as name. It can generate a conflict. Do you wish to continue?")%new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
+messageDialog = wx.MessageDialog(self, _("A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?")%new_name, _("Error"), wx.YES_NO|wx.ICON_QUESTION)
 if messageDialog.ShowModal() == wx.ID_NO:
 abort = True
 messageDialog.Destroy()
 if not abort:
 self.Controler.ChangeConfigurationResourceName(config_name, old_name, new_name)
 elif pou_name.upper() in self.PouNames:
 message = wx.MessageDialog(self, _("\"%s\" pou already exists!")%pou_name, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 elif pou_name.upper() in self.PouElementNames:
-message = wx.MessageDialog(self, _("A pou has an element with \"%s\" as name. It can generate a conflict. Do you wish to continue?")%pou_name, _("Warning"), wx.YES_NO|wx.ICON_EXCLAMATION)
+message = wx.MessageDialog(self, _("A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?")%pou_name, _("Warning"), wx.YES_NO|wx.ICON_EXCLAMATION)
 result = message.ShowModal()
 message.Destroy()
 if result == wx.ID_YES:
 self.EndModal(wx.ID_OK)
 else:
 elif transition_name.upper() in IEC_KEYWORDS:
 message = wx.MessageDialog(self, _("\"%s\" is a keyword. It can't be used!")%transition_name, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 elif transition_name.upper() in self.PouNames:
-message = wx.MessageDialog(self, _("A pou with \"%s\" as name exists!")%transition_name, _("Error"), wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self, _("A POU named \"%s\" already exists!")%transition_name, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 elif transition_name.upper() in self.PouElementNames:
 message = wx.MessageDialog(self, _("\"%s\" element for this pou already exists!")%transition_name, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 elif action_name.upper() in IEC_KEYWORDS:
 message = wx.MessageDialog(self, _("\"%s\" is a keyword. It can't be used!")%action_name, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 elif action_name.upper() in self.PouNames:
-message = wx.MessageDialog(self, _("A pou with \"%s\" as name exists!")%action_name, _("Error"), wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self, _("A POU named \"%s\" already exists!")%action_name, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 elif action_name.upper() in self.PouElementNames:
 message = wx.MessageDialog(self, _("\"%s\" element for this pou already exists!")%action_name, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 elif config_name.upper() in IEC_KEYWORDS:
 message = wx.MessageDialog(self, _("\"%s\" is a keyword. It can't be used!")%config_name, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 elif config_name.upper() in self.PouNames:
-message = wx.MessageDialog(self, _("A pou with \"%s\" as name exists!")%config_name, _("Error"), wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self, _("A POU named \"%s\" already exists!")%config_name, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 elif config_name.upper() in self.PouElementNames:
-message = wx.MessageDialog(self, _("A pou has an element with \"%s\" as name. It can generate a conflict. Do you wish to continue?")%config_name, _("Warning"), wx.YES_NO|wx.ICON_EXCLAMATION)
+message = wx.MessageDialog(self, _("A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?")%config_name, _("Warning"), wx.YES_NO|wx.ICON_EXCLAMATION)
 result = message.ShowModal()
 message.Destroy()
 if result == wx.ID_YES:
 self.EndModal(wx.ID_OK)
 else:
 elif resource_name.upper() in IEC_KEYWORDS:
 message = wx.MessageDialog(self, _("\"%s\" is a keyword. It can't be used!")%resource_name, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 elif resource_name.upper() in self.PouNames:
-message = wx.MessageDialog(self, _("A pou with \"%s\" as name exists!")%resource_name, _("Error"), wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self, _("A POU named \"%s\" already exists!")%resource_name, _("Error"), wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 elif resource_name.upper() in self.PouElementNames:
-message = wx.MessageDialog(self, _("A pou has an element with \"%s\" as name. It can generate a conflict. Do you wish to continue?")%resource_name, _("Warning"), wx.YES_NO|wx.ICON_EXCLAMATION)
+message = wx.MessageDialog(self, _("A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?")%resource_name, _("Warning"), wx.YES_NO|wx.ICON_EXCLAMATION)
 result = message.ShowModal()
 message.Destroy()
 if result == wx.ID_YES:
 self.EndModal(wx.ID_OK)
 else:
 if cap:
 cap.ReleaseMouse()
 dlg = wx.SingleChoiceDialog(None,
 _("""
-An error happens.
+An error has occurred.
-Click on OK for saving an error report.
+Click OK to save an error report.
 Please contact LOLITech at:
 +33 (0)3 29 57 60 42
 bugs_PLCOpenEditor@lolitech.fr

changeset 427	22d16c457d87
parent 423	53aa0c334f2f
child 428	3b19c34bac04