--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Fri Nov 01 15:48:48 2013 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sun Nov 03 15:58:22 2013 +0100 @@ -83,7 +83,7 @@ self.trUtf8("""The guards list has been changed.""" """ Shall the changes be applied?"""), E5MessageBox.StandardButtons( - E5MessageBox.Apply | \ + E5MessageBox.Apply | E5MessageBox.Discard), E5MessageBox.Apply) if res == E5MessageBox.Apply: @@ -126,7 +126,7 @@ self.trUtf8("""The guards list has been changed.""" """ Shall the changes be applied?"""), E5MessageBox.StandardButtons( - E5MessageBox.Apply | \ + E5MessageBox.Apply | E5MessageBox.Discard), E5MessageBox.Apply) if res == E5MessageBox.Apply: @@ -318,8 +318,8 @@ self, self.trUtf8("Apply Guard Definitions"), self.trUtf8("""<p>The defined guards could not be""" - """ applied.</p><p>Reason: {0}</p>""")\ - .format(error)) + """ applied.</p><p>Reason: {0}</p>""") + .format(error)) else: self.__dirtyList = False self.on_patchSelector_activated(