--- a/DataTypeEditor.py Thu Sep 17 11:16:14 2009 -0600
+++ b/DataTypeEditor.py Thu Sep 17 14:17:52 2009 -0600
@@ -769,7 +769,7 @@
## message.Destroy()
## event.Veto()
elif value.upper() in [var["Name"].upper() for idx, var in enumerate(self.StructureElementsTable.GetData()) if idx != row]:
- message = wx.MessageDialog(self, _("A element with \"%s\" as name exists in this structure!")%value, _("Error"), wx.OK|wx.ICON_ERROR)
+ message = wx.MessageDialog(self, _("An element named \"%s\" already exists in this structure!")%value, _("Error"), wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
event.Veto()
--- a/Dialogs.py Thu Sep 17 11:16:14 2009 -0600
+++ b/Dialogs.py Thu Sep 17 14:17:52 2009 -0600
@@ -1534,7 +1534,7 @@
message.ShowModal()
message.Destroy()
elif step_name.upper() in self.PouNames:
- message = wx.MessageDialog(self, _("A pou with \"%s\" as name exists!")%step_name, _("Error"), wx.OK|wx.ICON_ERROR)
+ message = wx.MessageDialog(self, _("A POU named \"%s\" already exists!")%step_name, _("Error"), wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
elif step_name.upper() in self.Variables:
@@ -2517,7 +2517,7 @@
message.ShowModal()
message.Destroy()
elif step_name.upper() in self.PouNames:
- message = wx.MessageDialog(self, _("A pou with \"%s\" as name exists!")%step_name, _("Error"), wx.OK|wx.ICON_ERROR)
+ message = wx.MessageDialog(self, _("A POU named \"%s\" already exists!")%step_name, _("Error"), wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
elif step_name.upper() in self.Variables:
@@ -2584,7 +2584,7 @@
message.ShowModal()
message.Destroy()
elif step_name.upper() in self.PouNames:
- message = wx.MessageDialog(self, _("A pou with \"%s\" as name exists!")%step_name, _("Error"), wx.OK|wx.ICON_ERROR)
+ message = wx.MessageDialog(self, _("A POU named \"%s\" already exists!")%step_name, _("Error"), wx.OK|wx.ICON_ERROR)
message.ShowModal()
message.Destroy()
else:
--- a/PLCControler.py Thu Sep 17 11:16:14 2009 -0600
+++ b/PLCControler.py Thu Sep 17 14:17:52 2009 -0600
@@ -1649,7 +1649,8 @@
if child.nodeType == tree.ELEMENT_NODE:
classname = plcopen.ElementNameToClass[child.nodeName]
if not self.CheckPasteCompatibility[bodytype](classname):
- return _("\"%s\" element can't be paste here!!!")%child.nodeName
+ return _("\"%s\" element can't be pasted here!!!")%child.nodeName
+
classobj = getattr(plcopen, classname, None)
if classobj is not None:
instance = classobj()
@@ -1659,7 +1660,7 @@
if blockname is not None:
blocktype = instance.gettypeName()
if element_type == "function":
- return _("FunctionBlock \"%s\" can't be paste in a Function!!!")%blocktype
+ return _("FunctionBlock \"%s\" can't be pasted in a Function!!!")%blocktype
blockname = self.GenerateNewName(tagname, blockname, "Block%d", debug=debug)
exclude[blockname] = True
instance.setinstanceName(blockname)
--- a/PLCOpenEditor.py Thu Sep 17 11:16:14 2009 -0600
+++ b/PLCOpenEditor.py Thu Sep 17 14:17:52 2009 -0600
@@ -1589,7 +1589,7 @@
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()
@@ -1602,7 +1602,7 @@
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:
@@ -1613,7 +1613,7 @@
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:
@@ -1626,12 +1626,12 @@
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()
@@ -1646,12 +1646,12 @@
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()
@@ -3308,7 +3308,7 @@
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:
@@ -3467,7 +3467,7 @@
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:
@@ -3611,7 +3611,7 @@
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:
@@ -3682,11 +3682,11 @@
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:
@@ -3745,11 +3745,11 @@
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:
@@ -4283,9 +4283,9 @@
dlg = wx.SingleChoiceDialog(None,
_("""
-An error happens.
-
-Click on OK for saving an error report.
+An error has occurred.
+
+Click OK to save an error report.
Please contact LOLITech at:
+33 (0)3 29 57 60 42
--- a/VariablePanel.py Thu Sep 17 11:16:14 2009 -0600
+++ b/VariablePanel.py Thu Sep 17 14:17:52 2009 -0600
@@ -266,9 +266,9 @@
return
message = None
if not self.ParentWindow.Table.GetValueByName(row, "Edit"):
- message = _("Can't affect a location to a function block instance")
+ message = _("Can't give a location to a function block instance")
elif self.ParentWindow.Table.GetValueByName(row, "Class") not in ["Local", "Global"]:
- message = _("Can affect a location only to local or global variables")
+ message = _("Can only give a location to local or global variables")
else:
try:
values = eval(data)
--- a/i18n/PLCOpenEditor_fr_FR.po Thu Sep 17 11:16:14 2009 -0600
+++ b/i18n/PLCOpenEditor_fr_FR.po Thu Sep 17 14:17:52 2009 -0600
@@ -18,9 +18,9 @@
#: ../PLCOpenEditor.py:5046
msgid ""
"\n"
-"An error happens.\n"
+"An error has occurred.\n"
"\n"
-"Click on OK for saving an error report.\n"
+"Click OK to save an error report.\n"
"\n"
"Please contact LOLITech at:\n"
"+33 (0)3 29 57 60 42\n"
@@ -120,7 +120,7 @@
#: ../PLCControler.py:1663
#, python-format
-msgid "\"%s\" element can't be paste here!!!"
+msgid "\"%s\" element can't be pasted here!!!"
msgstr "L'élément \"%s\" ne peut être collé ici !!!"
#: ../PLCOpenEditor.py:3467
@@ -282,7 +282,7 @@
#: ../DataTypeEditor.py:772
#, python-format
-msgid "A element with \"%s\" as name exists in this structure!"
+msgid "An element named \"%s\" already exists in this structure!"
msgstr "Un élément nommé \"%s\" existe déjà dans la structure !"
#: ../PLCOpenEditor.py:1585
@@ -292,13 +292,13 @@
#: ../PLCOpenEditor.py:3682
#: ../PLCOpenEditor.py:3745
#, python-format
-msgid "A pou has an element with \"%s\" as name. It can generate a conflict. Do you wish to continue?"
+msgid "A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?"
msgstr "Un POU a un élément nommé \"%s\". Cela peut générer des conflits. Voulez-vous continuer ?"
#: ../PLCOpenEditor.py:1622
#: ../PLCOpenEditor.py:1642
#, python-format
-msgid "A pou is defined with \"%s\" as name. It can generate a conflict. Do you wish to continue?"
+msgid "There is a POU named \"%s\". This could cause a conflict. Do you wish to continue?"
msgstr "Un POU a pour nom \"%s\". Cela peut générer des conflits. Voulez-vous continuer ?"
#: ../PLCOpenEditor.py:1598
@@ -312,7 +312,7 @@
#: ../Dialogs.py:2520
#: ../Dialogs.py:2587
#, python-format
-msgid "A pou with \"%s\" as name exists!"
+msgid "A POU named \"%s\" already exists!"
msgstr "Un POU nommé \"%s\" existe déjà !"
#: ../PLCOpenEditor.py:1600
@@ -351,7 +351,7 @@
#: ../plcopen/plcopen.py:1073
#, python-format
-msgid "Action with name %s doesn't exists!"
+msgid "Action with name %s doesn't exist!"
msgstr "L'action nommée %s n'existe pas !"
#: ../PLCControler.py:83
@@ -445,7 +445,7 @@
msgstr "Addition"
#: ../plcopen/structures.py:222
-msgid "Additionnal function blocks"
+msgid "Additional function blocks"
msgstr "Blocs fonctionnels additionnels"
#: ../Viewer.py:411
@@ -549,7 +549,7 @@
msgstr "Log CVS"
#: ../PLCOpenEditor.py:4074
-msgid "Can affect a location only to local or global variables"
+msgid "Can only give a location to local or global variables"
msgstr "Une adresse ne peut être affecté qu'à des variables locales ou globales"
#: ../plcopen/plcopen.py:1218
@@ -560,7 +560,7 @@
msgstr "L'ordre d'exécution ne peut être généré que dans les FBD !"
#: ../PLCOpenEditor.py:4072
-msgid "Can't affect a location to a function block instance"
+msgid "Can't give a location to a function block instance"
msgstr "Une adresse ne peut être affectée une instance de Function Block"
#: ../PLCOpenEditor.py:1094
@@ -1160,7 +1160,7 @@
#: ../PLCControler.py:1673
#, python-format
-msgid "FunctionBlock \"%s\" can't be paste in a Function!!!"
+msgid "FunctionBlock \"%s\" can't be pasted in a Function!!!"
msgstr "Le bloc fonctionnel \"%s\" ne peuvent être collés dans une function !"
#: ../PLCControler.py:82
@@ -1271,7 +1271,7 @@
#: ../plcopen/plcopen.py:1329
#, python-format
-msgid "Instance with id %d doesn't exists!"
+msgid "Instance with id %d doesn't exist!"
msgstr "L'instance dont l'id est %d n'existe pas !"
#: ../PLCOpenEditor.py:561
@@ -2082,7 +2082,7 @@
#: ../plcopen/plcopen.py:1035
#, python-format
-msgid "Transition with name %s doesn't exists!"
+msgid "Transition with name %s doesn't exist!"
msgstr "La transition nommée %s n'existe pas !"
#: ../PLCControler.py:83
--- a/i18n/PLCOpenEditor_zh_CN.po Thu Sep 17 11:16:14 2009 -0600
+++ b/i18n/PLCOpenEditor_zh_CN.po Thu Sep 17 14:17:52 2009 -0600
@@ -18,9 +18,9 @@
#: PLCOpenEditor.py:5108
msgid ""
"\n"
-"An error happens.\n"
+"An error has occurred.\n"
"\n"
-"Click on OK for saving an error report.\n"
+"Click OK to save an error report.\n"
"\n"
"Please contact LOLITech at:\n"
"+33 (0)3 29 57 60 42\n"
@@ -120,7 +120,7 @@
#: PLCControler.py:1648
#, python-format
-msgid "\"%s\" element can't be paste here!!!"
+msgid "\"%s\" element can't be pasted here!!!"
msgstr "\"%s\" 元素不能粘贴在这里！！！"
#: PLCOpenEditor.py:3528
@@ -282,7 +282,7 @@
#: DataTypeEditor.py:768
#, python-format
-msgid "A element with \"%s\" as name exists in this structure!"
+msgid "An element named \"%s\" already exists in this structure!"
msgstr "一个以\"%s\"命名的元素已经在这个结构中存在！"
#: PLCOpenEditor.py:1600
@@ -292,13 +292,13 @@
#: PLCOpenEditor.py:3743
#: PLCOpenEditor.py:3806
#, python-format
-msgid "A pou has an element with \"%s\" as name. It can generate a conflict. Do you wish to continue?"
+msgid "A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?"
msgstr "一个编程组织单元的成员被命名为\"%s\"。这可能会产生冲突。你希望继续吗？"
#: PLCOpenEditor.py:1647
#: PLCOpenEditor.py:1672
#, python-format
-msgid "A pou is defined with \"%s\" as name. It can generate a conflict. Do you wish to continue?"
+msgid "There is a POU named \"%s\". This could cause a conflict. Do you wish to continue?"
msgstr "一个编程组织单元被命名为\"%s\"。这可能会产生冲突。你希望继续吗？"
#: PLCOpenEditor.py:1618
@@ -312,7 +312,7 @@
#: Dialogs.py:2517
#: Dialogs.py:2584
#, python-format
-msgid "A pou with \"%s\" as name exists!"
+msgid "A POU named \"%s\" already exists!"
msgstr "一个以\"%s\"命名的的编程组织单元已经存在！"
#: PLCOpenEditor.py:1620
@@ -351,7 +351,7 @@
#: plcopen/plcopen.py:1028
#, python-format
-msgid "Action with name %s doesn't exists!"
+msgid "Action with name %s doesn't exist!"
msgstr "一个以\"%s\"命名的的行动不存在！"
#: PLCControler.py:83
@@ -445,7 +445,7 @@
msgstr "加法"
#: plcopen/structures.py:222
-msgid "Additionnal function blocks"
+msgid "Additional function blocks"
msgstr "附加功能类型"
#: Viewer.py:414
@@ -549,7 +549,7 @@
msgstr "逗号分隔值文件日志"
#: PLCOpenEditor.py:4137
-msgid "Can affect a location only to local or global variables"
+msgid "Can only give a location to local or global variables"
msgstr "只能影响本地或全局变量的位置"
#: plcopen/plcopen.py:1123
@@ -560,7 +560,7 @@
msgstr "在功能块网络，只能生成执行命令！"
#: PLCOpenEditor.py:4135
-msgid "Can't affect a location to a function block instance"
+msgid "Can't give a location to a function block instance"
msgstr "不能影响功能块实例的位置"
#: PLCOpenEditor.py:1093
@@ -1156,7 +1156,7 @@
#: PLCControler.py:1658
#, python-format
-msgid "FunctionBlock \"%s\" can't be paste in a Function!!!"
+msgid "FunctionBlock \"%s\" can't be pasted in a Function!!!"
msgstr "功能块 \"%s\" 不能用于功能中！"
#: PLCControler.py:82
@@ -1269,7 +1269,7 @@
#: plcopen/plcopen.py:1234
#, python-format
-msgid "Instance with id %d doesn't exists!"
+msgid "Instance with id %d doesn't exist!"
msgstr "有id的实例 %d 尚不存在！"
#: PLCOpenEditor.py:559
@@ -2080,7 +2080,7 @@
#: plcopen/plcopen.py:990
#, python-format
-msgid "Transition with name %s doesn't exists!"
+msgid "Transition with name %s doesn't exist!"
msgstr "已命名的跃迁 %s 尚不存在！"
#: PLCControler.py:83
--- a/i18n/messages.pot Thu Sep 17 11:16:14 2009 -0600
+++ b/i18n/messages.pot Thu Sep 17 14:17:52 2009 -0600
@@ -19,9 +19,9 @@
#: ../PLCOpenEditor.py:5046
msgid ""
"\n"
-"An error happens.\n"
+"An error has occurred.\n"
"\n"
-"Click on OK for saving an error report.\n"
+"Click OK to save an error report.\n"
"\n"
"Please contact LOLITech at:\n"
"+33 (0)3 29 57 60 42\n"
@@ -106,7 +106,7 @@
#: ../PLCControler.py:1663
#, python-format
-msgid "\"%s\" element can't be paste here!!!"
+msgid "\"%s\" element can't be pasted here!!!"
msgstr ""
#: ../PLCOpenEditor.py:3467 ../PLCOpenEditor.py:3611 ../Viewer.py:248
@@ -229,18 +229,18 @@
#: ../DataTypeEditor.py:772
#, python-format
-msgid "A element with \"%s\" as name exists in this structure!"
+msgid "A element named \"%s\" already exists in this structure!"
msgstr ""
#: ../PLCOpenEditor.py:1585 ../PLCOpenEditor.py:1627 ../PLCOpenEditor.py:1647
#: ../PLCOpenEditor.py:3304 ../PLCOpenEditor.py:3682 ../PLCOpenEditor.py:3745
#, python-format
-msgid "A pou has an element with \"%s\" as name. It can generate a conflict. Do you wish to continue?"
+msgid "A POU has an element named \"%s\". This could cause a conflict. Do you wish to continue?"
msgstr ""
#: ../PLCOpenEditor.py:1622 ../PLCOpenEditor.py:1642
#, python-format
-msgid "A pou is defined with \"%s\" as name. It can generate a conflict. Do you wish to continue?"
+msgid "There is a POU named \"%s\". This could cause a conflict. Do you wish to continue?"
msgstr ""
#: ../PLCOpenEditor.py:1598 ../PLCOpenEditor.py:1609 ../PLCOpenEditor.py:3463
@@ -248,7 +248,7 @@
#: ../PLCOpenEditor.py:4456 ../Dialogs.py:1537 ../Dialogs.py:2520
#: ../Dialogs.py:2587
#, python-format
-msgid "A pou with \"%s\" as name exists!"
+msgid "A POU named \"%s\" already exists!"
msgstr ""
#: ../PLCOpenEditor.py:1600 ../PLCOpenEditor.py:1611 ../PLCOpenEditor.py:4461
@@ -283,7 +283,7 @@
#: ../plcopen/plcopen.py:1073
#, python-format
-msgid "Action with name %s doesn't exists!"
+msgid "Action with name %s doesn't exist!"
msgstr ""
#: ../PLCControler.py:83
@@ -371,7 +371,7 @@
msgstr ""
#: ../plcopen/structures.py:222
-msgid "Additionnal function blocks"
+msgid "Additional function blocks"
msgstr ""
#: ../Viewer.py:411
@@ -471,7 +471,7 @@
msgstr ""
#: ../PLCOpenEditor.py:4074
-msgid "Can affect a location only to local or global variables"
+msgid "Can only give a location to local or global variables"
msgstr ""
#: ../plcopen/plcopen.py:1218 ../plcopen/plcopen.py:1232
@@ -480,7 +480,7 @@
msgstr ""
#: ../PLCOpenEditor.py:4072
-msgid "Can't affect a location to a function block instance"
+msgid "Can't give a location to a function block instance"
msgstr ""
#: ../PLCOpenEditor.py:1094
@@ -976,7 +976,7 @@
#: ../PLCControler.py:1673
#, python-format
-msgid "FunctionBlock \"%s\" can't be paste in a Function!!!"
+msgid "FunctionBlock \"%s\" can't be pasted in a Function!!!"
msgstr ""
#: ../PLCControler.py:82
@@ -1076,7 +1076,7 @@
#: ../plcopen/plcopen.py:1329
#, python-format
-msgid "Instance with id %d doesn't exists!"
+msgid "Instance with id %d doesn't exist!"
msgstr ""
#: ../PLCOpenEditor.py:561 ../PLCOpenEditor.py:599
@@ -1814,7 +1814,7 @@
#: ../plcopen/plcopen.py:1035
#, python-format
-msgid "Transition with name %s doesn't exists!"
+msgid "Transition with name %s doesn't exist!"
msgstr ""
#: ../PLCControler.py:83
--- a/plcopen/plcopen.py Thu Sep 17 11:16:14 2009 -0600
+++ b/plcopen/plcopen.py Thu Sep 17 14:17:52 2009 -0600
@@ -1032,7 +1032,7 @@
removed = True
i += 1
if not removed:
- raise ValueError, _("Transition with name %s doesn't exists!")%name
+ raise ValueError, _("Transition with name %s doesn't exist!")%name
setattr(cls, "removetransition", removetransition)
def addaction(self, name, type):
@@ -1070,7 +1070,7 @@
removed = True
i += 1
if not removed:
- raise ValueError, _("Action with name %s doesn't exists!")%name
+ raise ValueError, _("Action with name %s doesn't exist!")%name
setattr(cls, "removeaction", removeaction)
def updateElementName(self, old_name, new_name):
@@ -1326,7 +1326,7 @@
removed = True
i += 1
if not removed:
- raise ValueError, _("Instance with id %d doesn't exists!")%id
+ raise ValueError, _("Instance with id %d doesn't exist!")%id
else:
raise TypeError, "%s body don't have instances!"%self.content["name"]
setattr(cls, "removecontentInstance", removecontentInstance)
--- a/plcopen/structures.py Thu Sep 17 11:16:14 2009 -0600
+++ b/plcopen/structures.py Thu Sep 17 14:17:52 2009 -0600
@@ -219,7 +219,7 @@
"comment" : _("Off-delay timer\nThe off-delay timer can be used to delay setting an output false, for fixed period after input goes false."),
"generate" : generate_block, "initialise" : initialise_block},
]},
- {"name" : _("Additionnal function blocks"), "list":
+ {"name" : _("Additional function blocks"), "list":
## {"name" : "RTC", "type" : "functionBlock", "extensible" : False,
## "inputs" : [("EN","BOOL","none"),("PDT","DATE_AND_TIME","none")],
## "outputs" : [("Q","BOOL","none"),("CDT","DATE_AND_TIME","none")],