# HG changeset patch
# User Edouard Tisserant
# Date 1318195910 -7200
# Node ID 37ba389e5c01d5c2e98e1755a6321756c24fefa3
# Parent  4ce1664518167ddcc13d2b4d780e8565240e5e13# Parent  31976c61c70176243f459b4169830516460b6f68
merge

diff -r 31976c61c701 -r 37ba389e5c01 PLCOpenEditor.py
--- a/PLCOpenEditor.py	Sun Oct 09 20:10:36 2011 +0200
+++ b/PLCOpenEditor.py	Sun Oct 09 23:31:50 2011 +0200
@@ -374,7 +374,7 @@
 
     def _init_coll_DisplayMenu_Items(self, parent):
         AppendMenu(parent, help='', id=wx.ID_REFRESH,
-              kind=wx.ITEM_NORMAL, text=_(u'Refresh\tF5'))
+              kind=wx.ITEM_NORMAL, text=_(u'Refresh\tCTRL+R'))
         if self.EnableDebug:
             AppendMenu(parent, help='', id=wx.ID_CLEAR,
                   kind=wx.ITEM_NORMAL, text=_(u'Clear Errors\tCTRL+K'))
diff -r 31976c61c701 -r 37ba389e5c01 i18n/PLCOpenEditor_fr_FR.po
--- a/i18n/PLCOpenEditor_fr_FR.po	Sun Oct 09 20:10:36 2011 +0200
+++ b/i18n/PLCOpenEditor_fr_FR.po	Sun Oct 09 23:31:50 2011 +0200
@@ -1904,8 +1904,8 @@
 msgstr "Référence"
 
 #: ../PLCOpenEditor.py:370
-msgid "Refresh\tF5"
-msgstr "Actualiser\tF5"
+msgid "Refresh\tCTRL+R"
+msgstr "Actualiser\tCTRL+R"
 
 #: ../PLCOpenEditor.py:4240
 #: ../Viewer.py:1098
diff -r 31976c61c701 -r 37ba389e5c01 i18n/PLCOpenEditor_zh_CN.po
--- a/i18n/PLCOpenEditor_zh_CN.po	Sun Oct 09 20:10:36 2011 +0200
+++ b/i18n/PLCOpenEditor_zh_CN.po	Sun Oct 09 23:31:50 2011 +0200
@@ -1795,8 +1795,8 @@
 msgstr "参照"
 
 #: PLCOpenEditor.py:420
-msgid "Refresh\tF5"
-msgstr "重新载入\tF5"
+msgid "Refresh\tCTRL+R"
+msgstr "重新载入\tCTRL+R"
 
 #: plcopen/iec_std.csv:48
 msgid "Remainder (modulo)"
diff -r 31976c61c701 -r 37ba389e5c01 i18n/messages.pot
--- a/i18n/messages.pot	Sun Oct 09 20:10:36 2011 +0200
+++ b/i18n/messages.pot	Sun Oct 09 23:31:50 2011 +0200
@@ -1652,7 +1652,7 @@
 msgstr ""
 
 #: ../PLCOpenEditor.py:370
-msgid "Refresh\tF5"
+msgid "Refresh\tCTRL+R"
 msgstr ""
 
 #: ../PLCOpenEditor.py:4240 ../Viewer.py:1098